Mercurial > hg-stable

comparison tests/test-add.out @ 7821:9fe7e6acf525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 92ccccb55ba3
children 32537b12e091
comparison
equal deleted inserted replaced
7820:346fafc144fc 7821:9fe7e6acf525
16 created new head 16 created new head
17 merging a 17 merging a
18 warning: conflicts during merge. 18 warning: conflicts during merge.
19 merging a failed! 19 merging a failed!
20 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 20 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
21 use 'hg resolve' to retry unresolved file merges 21 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
22 M a 22 M a
23 ? a.orig 23 ? a.orig
24 % should fail 24 % should fail
25 a already tracked! 25 a already tracked!
26 M a 26 M a