Mercurial > hg
view tests/test-resolve.out @ 9861:0262bb59016f
support encoding fallback in branchmap to maintain compatibility with 1.3.x
author | Henrik Stuart <henrik.stuart@edlund.dk> |
---|---|
date | Mon, 16 Nov 2009 13:35:36 +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