Mercurial > hg

diff tests/test-merge9.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 5af5f0f9d724
children 368a4ec603cc
line wrap: on
line diff
--- a/tests/test-merge9.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-merge9.out	Fri Mar 21 11:06:02 2008 +0100
@@ -2,6 +2,7 @@
 adding foo
 adding quux1
 adding quux2
+created new head
 merging bar
 merging bar failed!
 merging foo and baz