3 Commits

Author	SHA1	Message	Date
Dan Villiom Podlaski Christiansen	17cfc8fdc9	merge: make 'diverging renames' diagnostic a more helpful note. ... See the Hg Book on why we actually want to detect this case: http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290 Before: $ hg up deadbeef warning: detected divergent renames of X to: ... After: $ hg up deadbeef note: possible conflict - X was renamed multiple times to: ... No functionality change.	2010-10-10 09:50:25 -05:00
Dan Villiom Podlaski Christiansen	cff327a7f7	copies: don't detect copies as "divergent renames" ... (For the purposes of this patch copy is defined as a rename where the source continues to exist.)	2010-10-10 09:48:37 -05:00
Adrian Buehlmann	e5136472fc	tests: unify test-rename-merge1	2010-09-14 13:43:05 +02:00