equal
deleted
inserted
replaced
428 basetext = readfile(base) |
428 basetext = readfile(base) |
429 othertext = readfile(other) |
429 othertext = readfile(other) |
430 except util.Abort: |
430 except util.Abort: |
431 return 1 |
431 return 1 |
432 |
432 |
433 local = os.path.realpath(local) |
433 local = util.realpath(local) |
434 if not opts.get('print'): |
434 if not opts.get('print'): |
435 opener = scmutil.opener(os.path.dirname(local)) |
435 opener = scmutil.opener(os.path.dirname(local)) |
436 out = opener(os.path.basename(local), "w", atomictemp=True) |
436 out = opener(os.path.basename(local), "w", atomictemp=True) |
437 else: |
437 else: |
438 out = sys.stdout |
438 out = sys.stdout |