equal
deleted
inserted
replaced
8 @@ -0,0 +1,1 @@ |
8 @@ -0,0 +1,1 @@ |
9 +This is file b1 |
9 +This is file b1 |
10 M b |
10 M b |
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
12 %% merge should fail |
12 %% merge should fail |
13 abort: 'b' already exists in the working dir and differs from remote |
13 abort: untracked local file 'b' differs from remote version |
14 %% merge of b expected |
14 %% merge of b expected |
15 merging for b |
15 merging for b |
16 merging b |
16 merging b |
17 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
17 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
18 (branch merge, don't forget to commit) |
18 (branch merge, don't forget to commit) |