Mercurial > hg

comparison tests/test-add.t @ 12314:f2daa6ab514a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.
author Brodie Rao <brodie@bitheap.org>
date Sun, 12 Sep 2010 18:05:53 -0500
parents 06793ad30575
children 4134686b83e1
comparison
equal deleted inserted replaced
12313:2912881c2a98 12314:f2daa6ab514a
51 $ hg merge 51 $ hg merge
52 merging a 52 merging a
53 warning: conflicts during merge. 53 warning: conflicts during merge.
54 merging a failed! 54 merging a failed!
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon 56 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
57 $ hg st 57 $ hg st
58 M a 58 M a
59 ? a.orig 59 ? a.orig
60 60
61 should fail 61 should fail