Mercurial > hg

diff tests/test-merge5.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 fffc8a733bf9
children 6aa4a3fa4e60
line wrap: on
line diff
--- a/tests/test-merge5.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-merge5.out	Fri Mar 21 11:06:02 2008 +0100
@@ -1,3 +1,4 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing b
+created new head
 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes