Show More
@@ -2368,9 +2368,8 b' def graft(' | |||||
2368 | def back_out(ctx, parent=None, wc=None): |
|
2368 | def back_out(ctx, parent=None, wc=None): | |
2369 | if parent is None: |
|
2369 | if parent is None: | |
2370 | if ctx.p2() is not None: |
|
2370 | if ctx.p2() is not None: | |
2371 | raise error.ProgrammingError( |
|
2371 | msg = b"must specify parent of merge commit to back out" | |
2372 | b"must specify parent of merge commit to back out" |
|
2372 | raise error.ProgrammingError(msg) | |
2373 | ) |
|
|||
2374 | parent = ctx.p1() |
|
2373 | parent = ctx.p1() | |
2375 | return _update( |
|
2374 | return _update( | |
2376 | ctx.repo(), |
|
2375 | ctx.repo(), |
General Comments 0
You need to be logged in to leave comments.
Login now