Mercurial > hg

diff tests/test-merge1.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 3109f012c305
line wrap: on
line diff
--- a/tests/test-merge1.out	Sun Oct 15 23:51:28 2006 -0700
+++ b/tests/test-merge1.out	Mon Oct 16 09:23:26 2006 +0200
@@ -1,6 +1,6 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% no merges expected
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 diff -r d9e5953b9dec b
 --- /dev/null
@@ -29,7 +29,7 @@
 %% merge fails
 abort: outstanding uncommitted changes
 %% merge expected!
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 diff -r c1dd73cbf59f b
 --- a/b