equal
deleted
inserted
replaced
435 except error.Abort: |
435 except error.Abort: |
436 return 1 |
436 return 1 |
437 |
437 |
438 local = os.path.realpath(local) |
438 local = os.path.realpath(local) |
439 if not opts.get('print'): |
439 if not opts.get('print'): |
440 opener = scmutil.opener(os.path.dirname(local)) |
440 opener = scmutil.vfs(os.path.dirname(local)) |
441 out = opener(os.path.basename(local), "w", atomictemp=True) |
441 out = opener(os.path.basename(local), "w", atomictemp=True) |
442 else: |
442 else: |
443 out = ui.fout |
443 out = ui.fout |
444 |
444 |
445 m3 = Merge3Text(basetext, localtext, othertext) |
445 m3 = Merge3Text(basetext, localtext, othertext) |