test-merge-revert.out
23 lines
| 611 B
| text/plain
|
TextLexer
/ tests / test-merge-revert.out
Martin Geisler
|
r12156 | 1:08a16e8e4408 | ||
0:d29c767a4b52 | ||||
08a16e8e4408 tip | ||||
Thomas Arendsen Hein
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Martin Geisler
|
r12156 | d29c767a4b52 | ||
d29c767a4b52+ | ||||
Vadim Gelfer
|
r2029 | reverting file1 | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | d29c767a4b52 | ||
Thomas Arendsen Hein
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | 08a16e8e4408 tip | ||
Thomas Arendsen Hein
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Matt Mackall
|
r3400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | 08a16e8e4408 tip | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | 08a16e8e4408 tip | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | 08a16e8e4408 tip | ||
Thomas Arendsen Hein
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Vadim Gelfer
|
r2030 | ? file1.orig | ||
Martin Geisler
|
r12156 | 08a16e8e4408 tip | ||