From: Junio C Hamano <redacted>
Date: Wed, 8 Feb 2017 21:36:03 +0000 (-0800)
Subject: Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a83c2d2972b7821e45192df08142d27ebc51da48;p=git.git

Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

* da/difftool-dir-diff-fix:
  difftool: fix dir-diff index creation when in a subdirectory
---

a83c2d2972b7821e45192df08142d27ebc51da48