Mercurial > hg
comparison tests/test-merge5.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 | fffc8a733bf9 |
children | 6aa4a3fa4e60 |
comparison
equal
deleted
inserted
replaced
6335:e29557d687c9 | 6336:4b0c9c674707 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2 removing b | 2 removing b |
3 created new head | |
3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes | 4 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |