Mercurial > hg-stable

diff tests/test-excessive-merge.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents 8feb33c2d153
children
line wrap: on
line diff
--- a/tests/test-excessive-merge.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-excessive-merge.out	Fri Mar 21 11:06:02 2008 +0100
@@ -1,9 +1,11 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
 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)
+created new head
 changeset:   4:f6c172c6198c
 tag:         tip
 parent:      1:448a8c5e42f1