Mercurial > hg
comparison tests/test-resolve.out @ 7734:9f73bddb9d0b
reset mergestate after commit
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Thu, 25 Dec 2008 10:42:01 +0100 |
| parents | |
| children | 9fe7e6acf525 |
comparison
equal
deleted
inserted
replaced
| 7733:30e95eafc1d0 | 7734:9f73bddb9d0b |
|---|---|
| 1 adding file | |
| 2 % create a second head | |
| 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 4 created new head | |
| 5 % failing merge | |
| 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 7 use 'hg resolve' to retry unresolved file merges | |
| 8 % resolve -l, should be empty |