##// END OF EJS Templates
Updated output of tests.
Updated output of tests.

File last commit:

r801:1f9ec150 default
r801:1f9ec150 default
Show More
test-merge4.out
10 lines | 202 B | text/plain | TextLexer
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 + hg init
+ hg add a
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m commit #0 -d 0 0
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 + hg add b
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m commit #1 -d 0 0
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 + hg update 0
+ hg add c
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m commit #2 -d 0 0
mpm@selenic.com
[PATCH] Removal of a file added by merging branches...
r416 + hg update -m 1
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m commit #3 -d 0 0