##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-resolve.t: add some output to show order of operations...
Siddharth Agarwal -
r26619:3b213a90 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -133,8 +133,10 b' resolve without arguments should suggest'
133 [255]
133 [255]
134
134
135 resolve --all should re-merge all unresolved files
135 resolve --all should re-merge all unresolved files
136 $ hg resolve -q --all
136 $ hg resolve --all
137 merging file1
137 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
138 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
139 merging file2
138 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
140 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
139 [1]
141 [1]
140 $ grep '<<<' file1 > /dev/null
142 $ grep '<<<' file1 > /dev/null
General Comments 0
You need to be logged in to leave comments. Login now