Mercurial > hg

diff tests/test-resolve.t @ 26619:3b213a904b98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: add some output to show order of operations This basically shows the behavior of resolve with multiple files. An upcoming behavior change will cause this output to also change.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 23:54:40 -0700
parents ef1eb6df7071
children 7955127efbcb
line wrap: on
line diff
--- a/tests/test-resolve.t	Sun Oct 11 21:56:39 2015 -0700
+++ b/tests/test-resolve.t	Sun Oct 11 23:54:40 2015 -0700
@@ -133,8 +133,10 @@
   [255]
 
 resolve --all should re-merge all unresolved files
-  $ hg resolve -q --all
+  $ hg resolve --all
+  merging file1
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+  merging file2
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null