Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authorSiddharth Agarwal <sid0@fb.com>
Sun, 11 Oct 2015 23:54:40 -0700
changeset 26619 3b213a904b98
parent 26618 8e6d5b7317e6
child 26620 7955127efbcb
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.
tests/test-resolve.t file | annotate | diff | comparison | revisions 
--- 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
hg-stable