##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r12156:4c94b6d0 default
r12278:c4c2ba55 merge default
Show More
test-merge-revert.out
23 lines | 611 B | text/plain | TextLexer
/ tests / test-merge-revert.out
1:08a16e8e4408
0:d29c767a4b52
08a16e8e4408 tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d29c767a4b52
d29c767a4b52+
reverting file1
? file1.orig
d29c767a4b52
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
08a16e8e4408 tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
08a16e8e4408 tip
? file1.orig
08a16e8e4408 tip
? file1.orig
08a16e8e4408 tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
08a16e8e4408 tip