Show More
@@ -4971,7 +4971,7 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4971 | 4971 | if complete: |
|
4972 | 4972 | try: |
|
4973 | 4973 | util.rename(a + ".resolve", |
|
4974 |
scmutil. |
|
|
4974 | scmutil.backuppath(ui, repo, f)) | |
|
4975 | 4975 | except OSError as inst: |
|
4976 | 4976 | if inst.errno != errno.ENOENT: |
|
4977 | 4977 | raise |
@@ -4997,7 +4997,7 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4997 | 4997 | # replace filemerge's .orig file with our resolve file |
|
4998 | 4998 | a = repo.wjoin(f) |
|
4999 | 4999 | try: |
|
5000 |
util.rename(a + ".resolve", scmutil. |
|
|
5000 | util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f)) | |
|
5001 | 5001 | except OSError as inst: |
|
5002 | 5002 | if inst.errno != errno.ENOENT: |
|
5003 | 5003 | raise |
General Comments 0
You need to be logged in to leave comments.
Login now