| author | Patrick Mezard <pmezard@gmail.com> |
| Fri, 01 Jan 2010 20:52:05 +0100 | |
| changeset 10188 | fd6e9c7cd98c |
| parent 9468 | b2310903c462 |
| child 11451 | 51021f4c80b5 |
| permissions | -rw-r--r-- |
adding file % create a second head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head % failing merge 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon % resolve -l, should be empty