Mercurial > hg

diff tests/test-flags.out @ 3323:b7a46cbf3f59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 10 Oct 2006 09:30:05 +0200
parents 455109df3669 966632304dde
children 0ac7fee4f024
line wrap: on
line diff
--- a/tests/test-flags.out	Tue Oct 10 00:02:30 2006 +0200
+++ b/tests/test-flags.out	Tue Oct 10 09:30:05 2006 +0200
@@ -45,7 +45,6 @@
 
 resolving manifests
 merging a
-resolving a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 pulling from ../test2