| changeset 1236 | 67a28636ea64 |
| parent 925 | 5a034646e472 |
| child 1581 | db10b7114de0 |
| 1235:5c0bd13bd771 | 1236:67a28636ea64 |
|---|---|
1 %% no merges expected |
|
2 %% merge of b expected |
|
1 merging for b |
3 merging for b |
2 merging b |
4 merging b |
5 %% |
|
6 Contents of b should be "this is file b1" |
|
3 This is file b1 |
7 This is file b1 |
8 %% merge expected! |
|
4 merging for b |
9 merging for b |
5 merging b |
10 merging b |
11 %% merge of b expected |
|
6 merging for b |
12 merging for b |
7 merging b |
13 merging b |