annotate tests/test-resolve.out @ 8779:708938509732

Improve English for help text of many core hg commands. co-author: Greg Ward <greg-hg@gerg.ca>
author timeless <timeless@gmail.com>
date Tue, 09 Jun 2009 21:51:34 -0400
parents 9fe7e6acf525
children b2310903c462
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
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