Mercurial > hg
view tests/test-resolve.out @ 12343:28642f7fc2cf stable
convert/svn: fix broken symlink renames in svn sink
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 20 Sep 2010 21:46:39 +0200 |
parents | 51021f4c80b5 |
children |
line wrap: on
line source
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