Show More
@@ -418,6 +418,8 b' def simplemerge(ui, localctx, basectx, o' | |||||
418 |
|
418 | |||
419 | The merged result is written into `localctx`. |
|
419 | The merged result is written into `localctx`. | |
420 | """ |
|
420 | """ | |
|
421 | opts = pycompat.byteskwargs(opts) | |||
|
422 | ||||
421 | def readctx(ctx): |
|
423 | def readctx(ctx): | |
422 | # Merges were always run in the working copy before, which means |
|
424 | # Merges were always run in the working copy before, which means | |
423 | # they used decoded data, if the user defined any repository |
|
425 | # they used decoded data, if the user defined any repository |
General Comments 0
You need to be logged in to leave comments.
Login now