changeset 44492 | f19491aae641 |
parent 44490 | 6d953b3fc2bd |
child 44493 | 8b5f5d8ad783 |
--- a/hgext/git/gitlog.py Sat Mar 07 16:51:21 2020 -0500 +++ b/hgext/git/gitlog.py Sat Mar 07 17:42:40 2020 -0500 @@ -274,7 +274,7 @@ if len(c.parents) > 2: raise error.Abort(b'TODO octopus merge handling') if len(c.parents) == 2: - p2 = self.rev(c.parents[0].id.raw) + p2 = self.rev(c.parents[1].id.raw) return p1, p2 # Private method is used at least by the tags code.