Mercurial > hg

diff tests/test-double-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 5af5f0f9d724
children 368a4ec603cc
line wrap: on
line diff
--- a/tests/test-double-merge.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-double-merge.out	Fri Mar 21 11:06:02 2008 +0100
@@ -1,3 +1,4 @@
+created new head
 resolving manifests
  overwrite None partial False
  ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9