| author | David Soria Parra <dsp@php.net> |
| Sat, 24 Jul 2010 22:15:22 +0200 | |
| changeset 11689 | 1135e42f0049 |
| parent 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 % resolve -l, should be empty