Skip to content
Snippets Groups Projects
Commit 3b213a904b98 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

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.
parent 8e6d5b7317e6
No related branches found
No related tags found
No related merge requests found
......@@ -133,5 +133,6 @@
[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')
......@@ -137,4 +138,5 @@
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment