Mercurial > public > mercurial-scm > hg

view tests/test-resolve.out @ 7775:5280c39778b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pure/mpatch: use StringIO instead of mmap (issue1493) This is more portable than memory mapping /dev/zero: Windows obviously does not have /dev/zero and mapping /dev/zero failed on Mac OS X.
author Martin Geisler <mg@daimi.au.dk>
date Mon, 16 Feb 2009 00:09:47 +0100
parents 9f73bddb9d0b
children 9fe7e6acf525
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
% resolve -l, should be empty