Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-revert.out
changeset 2175 b2ae81a7df29
parent 2036 c9226bcc288d
child 3311 966632304dde 
--- a/tests/test-merge-revert.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-merge-revert.out	Tue May 02 18:44:02 2006 +0200
@@ -1,19 +1,24 @@
 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
mercurial