equal
deleted
inserted
replaced
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39 created new head |
39 created new head |
40 Contents of b should be "this is file b1" |
40 Contents of b should be "this is file b1" |
41 This is file b1 |
41 This is file b1 |
42 %% merge fails |
42 %% merge fails |
43 abort: outstanding uncommitted changes |
43 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
44 %% merge expected! |
44 %% merge expected! |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 (branch merge, don't forget to commit) |
46 (branch merge, don't forget to commit) |
47 diff -r c1dd73cbf59f b |
47 diff -r c1dd73cbf59f b |
48 --- a/b |
48 --- a/b |
52 +This is file b22 |
52 +This is file b22 |
53 M b |
53 M b |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
55 created new head |
55 created new head |
56 %% merge of b should fail |
56 %% merge of b should fail |
57 abort: outstanding uncommitted changes |
57 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
58 %% merge of b expected |
58 %% merge of b expected |
59 merging for b |
59 merging for b |
60 merging b |
60 merging b |
61 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
62 (branch merge, don't forget to commit) |
62 (branch merge, don't forget to commit) |