| changeset 34797 | 284fa44f7f39 |
| parent 34796 | ed91846c29cf |
| child 34826 | 18a3274ed675 |
| 34796:ed91846c29cf | 34797:284fa44f7f39 |
|---|---|
737 r = _check(repo, r, ui, tool, fcd, files) |
737 r = _check(repo, r, ui, tool, fcd, files) |
738 |
738 |
739 if r: |
739 if r: |
740 if onfailure: |
740 if onfailure: |
741 ui.warn(onfailure % fd) |
741 ui.warn(onfailure % fd) |
742 _onfilemergefailure(ui) |
|
742 |
743 |
743 return True, r, deleted |
744 return True, r, deleted |
744 finally: |
745 finally: |
745 if not r and back is not None: |
746 if not r and back is not None: |
746 back.remove() |
747 back.remove() |