258 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
258 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) |
259 else: |
259 else: |
260 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) |
260 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) |
261 except error.ResponseExpected: |
261 except error.ResponseExpected: |
262 ui.write("\n") |
262 ui.write("\n") |
263 return 1, False |
263 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf) |
264 |
264 |
265 @internaltool('local', nomerge) |
265 @internaltool('local', nomerge) |
266 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): |
266 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): |
267 """Uses the local version of files as the merged version.""" |
267 """Uses the local version of files as the merged version.""" |
268 return 0, fcd.isabsent() |
268 return 0, fcd.isabsent() |