Show More
@@ -274,7 +274,7 b' class changelog(baselog):' | |||
|
274 | 274 | if len(c.parents) > 2: |
|
275 | 275 | raise error.Abort(b'TODO octopus merge handling') |
|
276 | 276 | if len(c.parents) == 2: |
|
277 |
p2 = self.rev(c.parents[ |
|
|
277 | p2 = self.rev(c.parents[1].id.raw) | |
|
278 | 278 | return p1, p2 |
|
279 | 279 | |
|
280 | 280 | # Private method is used at least by the tags code. |
General Comments 0
You need to be logged in to leave comments.
Login now