Mercurial > hg

comparison tests/test-add.out @ 9468:b2310903c462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.
author Stuart W Marks <smarks@smarks.org>
date Thu, 17 Sep 2009 22:39:38 -0700
parents b9a8b616521d
children
comparison
equal deleted inserted replaced
9467:4c041f1ee1b4 9468:b2310903c462
18 created new head 18 created new head
19 merging a 19 merging a
20 warning: conflicts during merge. 20 warning: conflicts during merge.
21 merging a failed! 21 merging a failed!
22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 22 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
23 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon 23 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
24 M a 24 M a
25 ? a.orig 25 ? a.orig
26 % should fail 26 % should fail
27 a already tracked! 27 a already tracked!
28 M a 28 M a