Show More
| @@ -191,7 +191,7 b' def filemerge(repo, fw, fd, fo, wctx, mc' | |||||
| 191 | r = 1 |
|
191 | r = 1 | |
| 192 |
|
192 | |||
| 193 | if _toolbool(ui, tool, "fixeol"): |
|
193 | if _toolbool(ui, tool, "fixeol"): | |
| 194 | _matcheol(repo.join(fd), back) |
|
194 | _matcheol(repo.wjoin(fd), back) | |
| 195 |
|
195 | |||
| 196 | if r: |
|
196 | if r: | |
| 197 | repo.ui.warn(_("merging %s failed!\n") % fd) |
|
197 | repo.ui.warn(_("merging %s failed!\n") % fd) | |
General Comments 0
You need to be logged in to leave comments.
Login now