| author | Brendan Cully <brendan@kublai.com> |
| Mon, 29 Jun 2009 09:00:37 -0700 | |
| changeset 8960 | 8a5657ecdaaf |
| parent 7821 | 9fe7e6acf525 |
| child 9468 | b2310903c462 |
| 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 up --clean' to abandon % resolve -l, should be empty