##// END OF EJS Templates
Changed coding hint to BOM
Changed coding hint to BOM

File last commit:

r749:7e4843b7 default
r760:73540173 default
Show More
test-merge5.out
19 lines | 411 B | text/plain | TextLexer
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
r415 + mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 + hg commit -m 'commit #0' -d '0 0'
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
r415 + echo This is file b22
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 + hg commit '-mcomment #1' -d '0 0'
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
r415 + hg update 0
+ rm b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 + hg commit -A '-mcomment #2' -d '0 0'
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
r415 + yes k
+ hg update 1
this update spans a branch affecting the following files:
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
r616 b
mpm@selenic.com
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...
r415 aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0