Mercurial > hg
comparison tests/test-merge-types.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 | 026eb80060d8 |
children | 8dca507e56ce |
comparison
equal
deleted
inserted
replaced
6335:e29557d687c9 | 6336:4b0c9c674707 |
---|---|
1 adding a | 1 adding a |
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 created new head | |
3 resolving manifests | 4 resolving manifests |
4 overwrite None partial False | 5 overwrite None partial False |
5 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | 6 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c |
6 searching for copies back to rev 1 | 7 searching for copies back to rev 1 |
7 a: update permissions -> e | 8 a: update permissions -> e |