Mercurial > hg
view tests/test-resolve.out @ 10556:9bd0bd785696 stable
i18n-da: synchronized with 091dddf05764
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 28 Feb 2010 18:02:20 +0100 |
parents | b2310903c462 |
children | 51021f4c80b5 |
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