equal
deleted
inserted
replaced
411 result = defaults[:] |
411 result = defaults[:] |
412 for i, override in enumerate(overrides): |
412 for i, override in enumerate(overrides): |
413 result[i] = override |
413 result[i] = override |
414 return result |
414 return result |
415 |
415 |
416 def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts): |
416 def simplemerge(ui, localctx, basectx, otherctx, **opts): |
417 """Performs the simplemerge algorithm. |
417 """Performs the simplemerge algorithm. |
418 |
418 |
419 The merged result is written into `localctx`. |
419 The merged result is written into `localctx`. |
420 """ |
420 """ |
421 def readctx(ctx): |
421 def readctx(ctx): |