Mercurial > public > mercurial-scm > hg

diff tests/test-backout.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 c48fee950ce4
children d46db4390715
line wrap: on
line diff
--- a/tests/test-backout.t	Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-backout.t	Wed Nov 25 14:25:26 2015 -0800
@@ -709,7 +709,7 @@
   update: (current)
   phases: 3 draft
   $ hg resolve --all --debug
-  picked tool ':merge' for foo (binary False symlink False)
+  picked tool ':merge' for foo (binary False symlink False changedelete False)
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful