Mercurial: tests/test-resolve.out@d56124931909 (annotated)

7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	1	adding file
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	2	% create a second head
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	3	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	4	created new head
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	5	% failing merge
9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	6	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
9468 b2310903c462 hg: say 'hg update' instead of 'hg up' in merge status message Stuart W Marks <smarks@smarks.org> parents: 7821 diff changeset	7	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	8	% resolve -l, should be empty

author	Martin Geisler <mg@aragost.com>
	Wed, 05 May 2010 09:25:09 +0200
changeset 11095	d56124931909
parent 9468	b2310903c462
child 11451	51021f4c80b5
permissions	-rw-r--r--