equal
deleted
inserted
replaced
29 ABC: A':Z B':Z C':A'B' |
29 ABC: A':Z B':Z C':A'B' |
30 D: D':Z |
30 D: D':Z |
31 AD: A':Z D':Z |
31 AD: A':Z D':Z |
32 BD: B':Z D':B' |
32 BD: B':Z D':B' |
33 ABD: A':Z B':Z D':B' |
33 ABD: A':Z B':Z D':B' |
34 CD: CRASH: revlog index out of range |
34 CD: ABORT: cannot use revision 3 as base, result would have 3 parents |
35 ACD: A':Z C':A'A' D':Z |
35 ACD: A':Z C':A'B D':Z |
36 BCD: B':Z C':B'A D':B' |
36 BCD: B':Z C':B'A D':B' |
37 ABCD: A':Z B':Z C':A'B' D':B' |
37 ABCD: A':Z B':Z C':A'B' D':B' |
38 |
38 |
39 Moving backwards |
39 Moving backwards |
40 |
40 |
50 A: |
50 A: |
51 BA: B':Z |
51 BA: B':Z |
52 C: ABORT: cannot use revision 3 as base, result would have 3 parents |
52 C: ABORT: cannot use revision 3 as base, result would have 3 parents |
53 BC: B':Z C':B'A |
53 BC: B':Z C':B'A |
54 AC: |
54 AC: |
55 BAC: ABORT: nothing to merge |
55 BAC: B':Z C':B'A |