Mercurial > hg
view tests/test-resolve.out @ 11681:c5e555e064d0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 25 Jul 2010 21:20:05 -0500 |
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