Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5

This commit is contained in:
Martin Panter 2015-11-02 04:04:57 +00:00
commit 2eb819f7a8
86 changed files with 136 additions and 136 deletions

View file

@ -1515,7 +1515,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None,
yield _make_line(lines,'-',0), None, True
continue
elif s.startswith(('--?+', '--+', '- ')):
# in delete block and see a intraline change or unchanged line
# in delete block and see an intraline change or unchanged line
# coming: yield the delete line and then blanks
from_line,to_line = _make_line(lines,'-',0), None
num_blanks_to_yield,num_blanks_pending = num_blanks_pending-1,0