##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Moving hgweb.py into it's own module in preparation for breaking it up.
Moving hgweb.py into it's own module in preparation for breaking it up.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r2311:b832b6eb default
Show More
test-merge-revert.out
24 lines | 625 B | text/plain | TextLexer
/ tests / test-merge-revert.out
History | Annotation | Raw |Copy content |Copy permalink
1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file1
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip