##// END OF EJS Templates
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

File last commit:

r775:122449dd default
r800:ec85f9e6 default
Show More
test-merge3.out
11 lines | 189 B | text/plain | TextLexer
mpm@selenic.com
[PATCH] (3/4) Removing an added file...
r402 + hg init
+ echo This is file a1
+ hg add a
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] (3/4) Removing an added file...
r402 + touch b
+ hg add b
+ rm b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 + hg commit -A '-mcomment #1' -d '0 0'
mpm@selenic.com
Fix up test results...
r775 adding .out
Bryan O'Sullivan
Update tests to match new addremove chattiness.
r767 removing b
mpm@selenic.com
[PATCH] (3/4) Removing an added file...
r402 b never committed!