comparison tests/test-add.out @ 6518:92ccccb55ba3

resolve: new command - add basic resolve command functionality - point failed update and merge at resolve
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Apr 2008 12:52:56 -0500
parents 4b0c9c674707
children 9fe7e6acf525
comparison
equal deleted inserted replaced
6517:fcfb6a0a0a84 6518:92ccccb55ba3
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 There are unresolved merges, you can redo the full merge using: 21 use 'hg resolve' to retry unresolved file merges
22 hg update -C 2
23 hg merge 1
24 M a 22 M a
25 ? a.orig 23 ? a.orig
26 % should fail 24 % should fail
27 a already tracked! 25 a already tracked!
28 M a 26 M a