Show More
@@ -28,6 +28,7 b' xxdiff.gui=True' | |||
|
28 | 28 | xxdiff.priority=-8 |
|
29 | 29 | |
|
30 | 30 | diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other |
|
31 | diffmerge.checkchanged=True | |
|
31 | 32 | diffmerge.gui=True |
|
32 | 33 | |
|
33 | 34 | p4merge.args=$base $local $other $output |
@@ -289,6 +289,10 b' merge-tools::' | |||
|
289 | 289 | Check whether there are conflicts even though the tool reported |
|
290 | 290 | success. |
|
291 | 291 | Default: False |
|
292 | checkchanged;; | |
|
293 | Check whether outputs were written even though the tool reported | |
|
294 | success. | |
|
295 | Default: False | |
|
292 | 296 | fixeol;; |
|
293 | 297 | Attempt to fix up EOL changes caused by the merge tool. |
|
294 | 298 | Default: False |
@@ -7,7 +7,7 b'' | |||
|
7 | 7 | |
|
8 | 8 | from node import * |
|
9 | 9 | from i18n import _ |
|
10 | import util, os, tempfile, context, simplemerge, re | |
|
10 | import util, os, tempfile, context, simplemerge, re, filecmp | |
|
11 | 11 | |
|
12 | 12 | def _toolstr(ui, tool, part, default=""): |
|
13 | 13 | return ui.config("merge-tools", tool + "." + part, default) |
@@ -193,6 +193,13 b' def filemerge(repo, fw, fd, fo, wctx, mc' | |||
|
193 | 193 | if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcm.data()): |
|
194 | 194 | r = 1 |
|
195 | 195 | |
|
196 | if not r and _toolbool(ui, tool, "checkchanged"): | |
|
197 | if filecmp.cmp(repo.wjoin(fd), back): | |
|
198 | if ui.prompt(_(" output file %s appears unchanged\n" | |
|
199 | "was merge successful (yn)?") % fd, | |
|
200 | _("[yn]"), _("n")) != _("y"): | |
|
201 | r = 1 | |
|
202 | ||
|
196 | 203 | if _toolbool(ui, tool, "fixeol"): |
|
197 | 204 | _matcheol(repo.wjoin(fd), back) |
|
198 | 205 |
General Comments 0
You need to be logged in to leave comments.
Login now