Mercurial > hg

annotate tests/test-resolve.out @ 10190:9c2c94934f0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: upgrade to git patch when necessary (issue767)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 01 Jan 2010 21:21:34 +0100
parents b2310903c462
children 51021f4c80b5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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