| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Tue, 20 Oct 2009 00:30:36 +0200 | |
| changeset 9616 | 0fedf8233b21 |
| 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