24
29
def test_unrelated(self):
25
30
br2 = self.test_nocommits()
27
merge, ['branch2', -1], [None, None]
28
32
self.assertRaises(UnrelatedBranches, merge, ['branch2', -1],
43
merge(['branch2', -1], ['branch2', 0])
52
self.assertEquals(common_ancestor(last, last, br1), last)