Mercurial > hg

diff tests/test-merge-revert.out @ 3408:4e0c08f019b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 16 Oct 2006 09:23:26 +0200
parents d2b55e3c4e25
children 4c94b6d0fb1c
line wrap: on
line diff
--- a/tests/test-merge-revert.out	Sun Oct 15 23:51:28 2006 -0700
+++ b/tests/test-merge-revert.out	Mon Oct 16 09:23:26 2006 +0200
@@ -11,7 +11,7 @@
 ? file1.orig
 016807e6fdaf tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
 016807e6fdaf tip
 ? file1.orig