[meld: 2/2] Merge branch 'dirdiff._files_same.need_contents' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit 28a0c4669915654cdb975d2c1d5d570d58b5c67e
Merge: bfb0eed3 489a400f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Jul 10 21:09:58 2018 +0000

    Merge branch 'dirdiff._files_same.need_contents' into 'master'
    
    files_same.need_contents - When `ignore blank line` retain content for rematch after remove blank lines
    
    See merge request GNOME/meld!19

 meld/dirdiff.py                 |  7 ++--
 test/dirdiff/__init__.py        |  0
 test/dirdiff/fixture.py         | 72 ++++++++++++++++++++++++++++++++++++++
 test/dirdiff/test_files_same.py | 76 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 2 deletions(-)
---