equal
deleted
inserted
replaced
5676 |
5676 |
5677 # replace filemerge's .orig file with our resolve file |
5677 # replace filemerge's .orig file with our resolve file |
5678 # for files in tocomplete, ms.resolve will not overwrite |
5678 # for files in tocomplete, ms.resolve will not overwrite |
5679 # .orig -- only preresolve does |
5679 # .orig -- only preresolve does |
5680 try: |
5680 try: |
5681 util.rename(a + ".resolve", a + ".orig") |
5681 util.rename(a + ".resolve", cmdutil.origpath(ui, repo, a)) |
5682 except OSError as inst: |
5682 except OSError as inst: |
5683 if inst.errno != errno.ENOENT: |
5683 if inst.errno != errno.ENOENT: |
5684 raise |
5684 raise |
5685 |
5685 |
5686 for f in tocomplete: |
5686 for f in tocomplete: |