Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-excessive-merge.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff
--- a/tests/test-excessive-merge.out
+++ b/tests/test-excessive-merge.out
@@ -1,3 +1,9 @@
+1 files updated, 0 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)
+1 files updated, 0 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)
 changeset:   4:f6c172c6198c
 tag:         tip
 parent:      1:448a8c5e42f1