diff options
| author | Raymond Hettinger <python@rcn.com> | 2015-11-02 00:04:46 -0500 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2015-11-02 00:04:46 -0500 |
| commit | 0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2 (patch) | |
| tree | 4b47f7e8db6a919ad9e1dd8da0f21144754e7ffa /Lib/difflib.py | |
| parent | 67b97b8f8dc792aa7e1130a52a0ccc5069c400ed (diff) | |
| parent | e56a9191000d2ff15d7550b9c852fa6dee9b8f50 (diff) | |
| download | cpython-git-0bdf9ea136c4acca2de0fe6ab799ab35d5b09fd2.tar.gz | |
merge
Diffstat (limited to 'Lib/difflib.py')
| -rw-r--r-- | Lib/difflib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py index 22d9145a07..076bbac01d 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -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 |