Mercurial > public > mercurial-scm > hg

diff tests/test-merge-types.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 026eb80060d8
children 8dca507e56ce
line wrap: on
line diff
--- a/tests/test-merge-types.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-merge-types.out	Fri Mar 21 11:06:02 2008 +0100
@@ -1,5 +1,6 @@
 adding a
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
 resolving manifests
  overwrite None partial False
  ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c