Show More
@@ -146,8 +146,8 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
146 | if not tool or tool == 'internal:prompt': |
|
146 | if not tool or tool == 'internal:prompt': | |
147 | tool = "internal:local" |
|
147 | tool = "internal:local" | |
148 | if ui.promptchoice(_(" no tool found to merge %s\n" |
|
148 | if ui.promptchoice(_(" no tool found to merge %s\n" | |
149 | "keep (l)ocal or take (o)ther?") % fd, |
|
149 | "keep (l)ocal or take (o)ther?") % fd, | |
150 | (_("&Local"), _("&Other")), 0): |
|
150 | (_("&Local"), _("&Other")), 0): | |
151 | tool = "internal:other" |
|
151 | tool = "internal:other" | |
152 | if tool == "internal:local": |
|
152 | if tool == "internal:local": | |
153 | return 0 |
|
153 | return 0 | |
@@ -214,8 +214,8 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
214 | if not r and _toolbool(ui, tool, "checkchanged"): |
|
214 | if not r and _toolbool(ui, tool, "checkchanged"): | |
215 | if filecmp.cmp(repo.wjoin(fd), back): |
|
215 | if filecmp.cmp(repo.wjoin(fd), back): | |
216 | if ui.promptchoice(_(" output file %s appears unchanged\n" |
|
216 | if ui.promptchoice(_(" output file %s appears unchanged\n" | |
217 | "was merge successful (yn)?") % fd, |
|
217 | "was merge successful (yn)?") % fd, | |
218 | (_("&Yes"), _("&No")), 1): |
|
218 | (_("&Yes"), _("&No")), 1): | |
219 | r = 1 |
|
219 | r = 1 | |
220 |
|
220 | |||
221 | if _toolbool(ui, tool, "fixeol"): |
|
221 | if _toolbool(ui, tool, "fixeol"): |
@@ -82,7 +82,7 b' def submerge(repo, wctx, mctx, actx):' | |||||
82 | if repo.ui.promptchoice( |
|
82 | if repo.ui.promptchoice( | |
83 | _(' local changed subrepository %s which remote removed\n' |
|
83 | _(' local changed subrepository %s which remote removed\n' | |
84 | 'use (c)hanged version or (d)elete?') % s, |
|
84 | 'use (c)hanged version or (d)elete?') % s, | |
85 |
|
|
85 | (_('&Changed'), _('&Delete')), 0): | |
86 | wctx.sub(s).remove() |
|
86 | wctx.sub(s).remove() | |
87 |
|
87 | |||
88 | for s, r in s2.items(): |
|
88 | for s, r in s2.items(): | |
@@ -95,7 +95,7 b' def submerge(repo, wctx, mctx, actx):' | |||||
95 | if repo.ui.promptchoice( |
|
95 | if repo.ui.promptchoice( | |
96 | _(' remote changed subrepository %s which local removed\n' |
|
96 | _(' remote changed subrepository %s which local removed\n' | |
97 | 'use (c)hanged version or (d)elete?') % s, |
|
97 | 'use (c)hanged version or (d)elete?') % s, | |
98 |
|
|
98 | (_('&Changed'), _('&Delete')), 0) == 0: | |
99 | wctx.sub(s).get(r) |
|
99 | wctx.sub(s).get(r) | |
100 | sm[s] = r |
|
100 | sm[s] = r | |
101 |
|
101 |
General Comments 0
You need to be logged in to leave comments.
Login now