test-merge-revert.out
24 lines
| 625 B
| text/plain
|
TextLexer
/ tests / test-merge-revert.out
|
r1933 | 1:016807e6fdaf | ||
0:eb43f19ff115 | ||||
016807e6fdaf tip | ||||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1933 | eb43f19ff115 | ||
eb43f19ff115+ | ||||
|
r2029 | reverting file1 | ||
|
r2030 | ? file1.orig | ||
|
r1933 | eb43f19ff115 | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2030 | ? file1.orig | ||
|
r1933 | 016807e6fdaf tip | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r792 | merging file1 | ||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r2030 | ? file1.orig | ||
|
r1933 | 016807e6fdaf tip | ||
|
r2030 | ? file1.orig | ||
|
r1933 | 016807e6fdaf tip | ||
|
r2030 | ? file1.orig | ||
|
r1933 | 016807e6fdaf tip | ||
|
r2175 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2030 | ? file1.orig | ||
|
r1933 | 016807e6fdaf tip | ||