equal
deleted
inserted
replaced
6 merging b |
6 merging b |
7 %% |
7 %% |
8 Contents of b should be "this is file b1" |
8 Contents of b should be "this is file b1" |
9 This is file b1 |
9 This is file b1 |
10 %% merge fails |
10 %% merge fails |
11 abort: outstanding uncommited changes |
11 abort: outstanding uncommitted changes |
12 %% merge expected! |
12 %% merge expected! |
13 merging for b |
13 merging for b |
14 merging b |
14 merging b |
15 %% merge of b should fail |
15 %% merge of b should fail |
16 abort: outstanding uncommited changes |
16 abort: outstanding uncommitted changes |
17 %% merge of b expected |
17 %% merge of b expected |
18 merging for b |
18 merging for b |
19 merging b |
19 merging b |