Show More
@@ -746,6 +746,9 b' def _xmerge(repo, mynode, local, other, ' | |||||
746 | localoutputpath = None |
|
746 | localoutputpath = None | |
747 | if b"$output" in args: |
|
747 | if b"$output" in args: | |
748 | localoutputpath = backup.path() |
|
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 | with _maketempfiles( |
|
753 | with _maketempfiles( | |
751 | fco, |
|
754 | fco, | |
@@ -940,10 +943,6 b' def _maketempfiles(fco, fca, localpath):' | |||||
940 | c = tempfromcontext(b"other", fco) |
|
943 | c = tempfromcontext(b"other", fco) | |
941 | d = localpath |
|
944 | d = localpath | |
942 | if localpath is not None: |
|
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 | f, d = maketempfrompath(b"local", d) |
|
946 | f, d = maketempfrompath(b"local", d) | |
948 | with open(localpath, b'rb') as src: |
|
947 | with open(localpath, b'rb') as src: | |
949 | f.write(src.read()) |
|
948 | f.write(src.read()) |
General Comments 0
You need to be logged in to leave comments.
Login now