Mercurial > public > mercurial-scm > hg

diff tests/test-rename-merge1.t @ 27161:296d55def9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add debug output for whether this is a change/delete conflict Just like binary and symlink conflicts, change/delete conflicts influence the tool picked.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:25:26 -0800
parents d16d73173fdd
children 009d0283de5f
line wrap: on
line diff
--- a/tests/test-rename-merge1.t	Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-rename-merge1.t	Wed Nov 25 14:25:26 2015 -0800
@@ -44,7 +44,7 @@
    b2: remote created -> g
   getting b2
    b: remote moved from a -> m (premerge)
-  picked tool ':merge' for b (binary False symlink False)
+  picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful