Show More
@@ -746,6 +746,9 b' def _xmerge(repo, mynode, local, other, ' | |||
|
746 | 746 | localoutputpath = None |
|
747 | 747 | if b"$output" in args: |
|
748 | 748 | localoutputpath = backup.path() |
|
749 | # Remove the .orig to make syntax-highlighting more likely. | |
|
750 | if localoutputpath.endswith(b'.orig'): | |
|
751 | localoutputpath, ext = os.path.splitext(localoutputpath) | |
|
749 | 752 | |
|
750 | 753 | with _maketempfiles( |
|
751 | 754 | fco, |
@@ -940,10 +943,6 b' def _maketempfiles(fco, fca, localpath):' | |||
|
940 | 943 | c = tempfromcontext(b"other", fco) |
|
941 | 944 | d = localpath |
|
942 | 945 | if localpath is not None: |
|
943 | # We start off with this being the backup filename, so remove the .orig | |
|
944 | # to make syntax-highlighting more likely. | |
|
945 | if d.endswith(b'.orig'): | |
|
946 | d, _ = os.path.splitext(d) | |
|
947 | 946 | f, d = maketempfrompath(b"local", d) |
|
948 | 947 | with open(localpath, b'rb') as src: |
|
949 | 948 | f.write(src.read()) |
General Comments 0
You need to be logged in to leave comments.
Login now