##// END OF EJS Templates
Add in and out aliases
Add in and out aliases

File last commit:

r925:5a034646 default
r940:1300271b default
Show More
test-merge-revert.out
12 lines | 186 B | text/plain | TextLexer
/ tests / test-merge-revert.out
mpm@selenic.com
run-tests: remove '+ hg' trick...
r925 1:3aa14bbc23d9
0:8633637036c1
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
r792 3aa14bbc23d9 tip
8633637036c1
8633637036c1+
8633637036c1
3aa14bbc23d9 tip
merging file1
3aa14bbc23d9 tip
mpm@selenic.com
run-tests: remove '+ hg' trick...
r925 3aa14bbc23d9 tip
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
r792 3aa14bbc23d9 tip
3aa14bbc23d9 tip