Mercurial > hg

diff tests/test-graft.t @ 26611:a5ff66e6d77a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: break overall filemerge into separate premerge and merge steps This means that in ms.resolve we must call merge after calling premerge. This doesn't yet mean that all premerges happen before any merges -- however, this does get us closer to our goal. The output differences are because we recompute the merge tool. The only user-visible difference caused by this patch is that if the tool is missing we'll print the warning twice. Not a huge deal, though.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 20:47:14 -0700
parents d8463a743d7d
children ef1eb6df7071
line wrap: on
line diff
--- a/tests/test-graft.t	Sun Oct 11 20:04:40 2015 -0700
+++ b/tests/test-graft.t	Sun Oct 11 20:47:14 2015 -0700
@@ -187,6 +187,8 @@
   picked tool ':merge' for e (binary False symlink False)
   merging e
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
+  picked tool ':merge' for e (binary False symlink False)
+  my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue