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

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

Fix up test-merge1...
mpm@selenic.com -
r430:5b22029b default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -59,9 +59,10 b' hg update 1'
59 echo This is file c1 > c
59 echo This is file c1 > c
60 hg add c
60 hg add c
61 hg commit -t "commit #3" -d "0 0" -u user
61 hg commit -t "commit #3" -d "0 0" -u user
62 cat b
62 echo This is file b22 > b
63 echo This is file b22 > b
63 env HGMERGE=../merge hg update -m 2
64 env HGMERGE=../merge hg update -m 2
64 # no merges expected
65 # merge expected!
65 cd ..; /bin/rm -rf t
66 cd ..; /bin/rm -rf t
66
67
67 mkdir t
68 mkdir t
Show file before | Show file after | Hide comments
@@ -51,8 +51,12 b' merging b'
51 + echo This is file c1
51 + echo This is file c1
52 + hg add c
52 + hg add c
53 + hg commit -t 'commit #3' -d '0 0' -u user
53 + hg commit -t 'commit #3' -d '0 0' -u user
54 + cat b
55 This is file b1
54 + echo This is file b22
56 + echo This is file b22
55 + env HGMERGE=../merge hg update -m 2
57 + env HGMERGE=../merge hg update -m 2
58 merging for b
59 merging b
56 + cd ..
60 + cd ..
57 + /bin/rm -rf t
61 + /bin/rm -rf t
58 + mkdir t
62 + mkdir t
General Comments 0
You need to be logged in to leave comments. Login now