##// END OF EJS Templates
Merge with upstream
Merge with upstream

File last commit:

r749:7e4843b7 default
r793:445970cc merge default
Show More
test-backwards-remove.out
12 lines | 174 B | text/plain | TextLexer
/ tests / test-backwards-remove.out
mpm@selenic.com
hg merge: fix time asymmetry bug with deleting files on update to past...
r383 + 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
hg merge: fix time asymmetry bug with deleting files on update to past...
r383 + ls
a
+ echo This is file b1
+ hg add b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 + hg commit -m 'commit #1' -d '0 0'
mpm@selenic.com
hg merge: fix time asymmetry bug with deleting files on update to past...
r383 + hg co 0
+ ls
a