Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
6335:e29557d687c9 | 6336:4b0c9c674707 |
---|---|
6 forgetting b | 6 forgetting b |
7 %%% should show b unknown and a back to normal | 7 %%% should show b unknown and a back to normal |
8 ? b | 8 ? b |
9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 created new head | |
11 merging a | 12 merging a |
12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 13 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
13 (branch merge, don't forget to commit) | 14 (branch merge, don't forget to commit) |
14 %%% should show foo-b | 15 %%% should show foo-b |
15 foo-b | 16 foo-b |