hg-stable: tests/test-resolve.out@0593c5b5b1f0 (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
7821 9fe7e6acf525 merge: better error messages to lead users to hg update --clean to abandon merges. Augie Fackler <durin42@gmail.com> parents: 7734 diff changeset	7	use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
7734 9f73bddb9d0b reset mergestate after commit Martin Geisler <mg@daimi.au.dk> parents: diff changeset	8	% resolve -l, should be empty

author	Patrick Mezard <pmezard@gmail.com>
	Sun, 21 Jun 2009 23:17:02 +0200
changeset 8886	0593c5b5b1f0
parent 7821	9fe7e6acf525
child 9468	b2310903c462
permissions	-rw-r--r--