Mercurial > hg
diff tests/test-confused-revert.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 | 53cbb33e1269 |
| children |
line wrap: on
line diff
--- a/tests/test-confused-revert.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-confused-revert.out Fri Mar 21 11:06:02 2008 +0100 @@ -8,6 +8,7 @@ ? b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)