Show More
@@ -237,7 +237,7 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
237 | @internaltool('local', nomerge) |
|
237 | @internaltool('local', nomerge) | |
238 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
238 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): | |
239 | """Uses the local version of files as the merged version.""" |
|
239 | """Uses the local version of files as the merged version.""" | |
240 |
return 0, |
|
240 | return 0, fcd.isabsent() | |
241 |
|
241 | |||
242 | @internaltool('other', nomerge) |
|
242 | @internaltool('other', nomerge) | |
243 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
243 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): |
General Comments 0
You need to be logged in to leave comments.
Login now