Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-imerge.out @ 5042:58006f8b8275

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge extension and test
author Brendan Cully <brendan@kublai.com>
date Wed, 01 Aug 2007 11:37:11 -0700
parents
children 86327d13d916
comparison
equal deleted inserted replaced
5041:49059086c634 5042:58006f8b8275
1 adding bar
2 adding foo
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 % start imerge
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit)
7 merging e6da46716401 and 1c0a86e7db0d
8 remaining:
9 foo
10 foo
11 bar
12 bar
13 bar
14 % status
15 merging e6da46716401 and 1c0a86e7db0d
16 remaining:
17 foo
18 % merge next
19 merging foo
20 all conflicts resolved
21 % unresolve
22 % merge foo
23 merging foo
24 all conflicts resolved
25 % save
26 % load
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
30 (branch merge, don't forget to commit)
31 merging e6da46716401 and 1c0a86e7db0d
32 resolved:
33 foo
34 all conflicts resolved
35 foo
36 changeset: 3:eaf80a943462
37 tag: tip
38 parent: 2:e6da46716401
39 parent: 1:1c0a86e7db0d
40 user: test
41 date: Thu Jan 01 00:00:03 1970 +0000
42 files: foo
43 description:
44 merged
45
46
47 % nothing to merge
48 abort: there is nothing to merge - use "hg update" instead