| changeset 4659 | 7a7d4937272b |
| parent 3853 | c0b449154a90 |
| 4658:17f5d2069551 | 4659:7a7d4937272b |
|---|---|
1 #!/bin/sh |
1 #!/bin/sh |
2 # |
2 # |
3 # A B |
3 # A B |
4 # |
4 # |
5 # 3 4 3 |
5 # 3 4 3 |
6 # |\/| |\ |
6 # |\/| |\ |
7 # |/\| | \ |
7 # |/\| | \ |
8 # 1 2 1 2 |
8 # 1 2 1 2 |
9 # \ / \ / |
9 # \ / \ / |
10 # 0 0 |
10 # 0 0 |
11 # |
11 # |
12 # if the result of the merge of 1 and 2 |
12 # if the result of the merge of 1 and 2 |
13 # is the same in 3 and 4, no new manifest |
13 # is the same in 3 and 4, no new manifest |
14 # will be created and the manifest group |
14 # will be created and the manifest group |