equal
deleted
inserted
replaced
189 if not r and _toolbool(ui, tool, "checkconflicts"): |
189 if not r and _toolbool(ui, tool, "checkconflicts"): |
190 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcm.data()): |
190 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcm.data()): |
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) |
198 else: |
198 else: |
199 os.unlink(back) |
199 os.unlink(back) |