Mercurial > hg
diff tests/test-annotate.out @ 6336:4b0c9c674707
warn about new heads on commit (issue842)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 21 Mar 2008 11:06:02 +0100 |
parents | 2192001e4bb4 |
children | 98a0421b9e52 |
line wrap: on
line diff
--- a/tests/test-annotate.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-annotate.out Fri Mar 21 11:06:02 2008 +0100 @@ -46,6 +46,7 @@ 3 b:5: b5 3 b:6: b6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -64,6 +65,7 @@ 4 b:5: c 3 b:5: b5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved +created new head merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)