Mercurial > public > mercurial-scm > hg
diff tests/test-extdiff.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 | 2be225ea5722 |
| children | e81e6c996e99 |
line wrap: on
line diff
--- a/tests/test-extdiff.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-extdiff.out Fri Mar 21 11:06:02 2008 +0100 @@ -26,6 +26,7 @@ use "hg -v help falabala" to show global options diffing a.8a5febb7f867/a a.34eed99112ab/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)