Show More
@@ -181,7 +181,7 b' def update(repo, node, branchmerge=False' | |||||
181 | elif f in ma: |
|
181 | elif f in ma: | |
182 | if n != ma[f]: |
|
182 | if n != ma[f]: | |
183 | r = _("d") |
|
183 | r = _("d") | |
184 |
if not overwrite |
|
184 | if not overwrite: | |
185 | r = repo.ui.prompt( |
|
185 | r = repo.ui.prompt( | |
186 | (_(" local changed %s which remote deleted\n") % f) + |
|
186 | (_(" local changed %s which remote deleted\n") % f) + | |
187 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
187 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) | |
@@ -211,7 +211,7 b' def update(repo, node, branchmerge=False' | |||||
211 | continue |
|
211 | continue | |
212 | if f in ma and n != ma[f]: |
|
212 | if f in ma and n != ma[f]: | |
213 | r = _("k") |
|
213 | r = _("k") | |
214 |
if not overwrite |
|
214 | if not overwrite: | |
215 | r = repo.ui.prompt( |
|
215 | r = repo.ui.prompt( | |
216 | (_("remote changed %s which local deleted\n") % f) + |
|
216 | (_("remote changed %s which local deleted\n") % f) + | |
217 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
|
217 | _("(k)eep or (d)elete?"), _("[kd]"), _("k")) |
General Comments 0
You need to be logged in to leave comments.
Login now