Show More
@@ -329,9 +329,9 b' def filterpatch(ui, chunks):' | |||||
329 | if resp_file[0] is None and resp_all[0] is None: |
|
329 | if resp_file[0] is None and resp_all[0] is None: | |
330 | chunk.pretty(ui) |
|
330 | chunk.pretty(ui) | |
331 | r = total == 1 and prompt(_('record this change to %r?') % |
|
331 | r = total == 1 and prompt(_('record this change to %r?') % | |
332 |
chunk.filename()) |
|
332 | chunk.filename()) \ | |
333 | prompt(_('record change %d/%d to %r?') % |
|
333 | or prompt(_('record change %d/%d to %r?') % | |
334 | (pos, total, chunk.filename())) |
|
334 | (pos, total, chunk.filename())) | |
335 | if r == _('y'): |
|
335 | if r == _('y'): | |
336 | if fixoffset: |
|
336 | if fixoffset: | |
337 | chunk = copy.copy(chunk) |
|
337 | chunk = copy.copy(chunk) |
General Comments 0
You need to be logged in to leave comments.
Login now