Merge branch 'da/difftool-dir-diff-fix' into maint
[git/debian.git] / t / t5100 / msg0015
blobe69de29bb2d1d6434b8b29ae775ad8c2e48c5391