From: Junio C Hamano <redacted>
Date: Mon, 19 Dec 2016 22:45:33 +0000 (-0800)
Subject: Merge branch 'da/difftool-dir-diff-fix'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=afe0e2a391665c01daae78d8f8a9a105420b0218;p=git.git

Merge branch 'da/difftool-dir-diff-fix'

"git difftool --dir-diff" had a minor regression when started from
a subdirectory, which has been fixed.

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

afe0e2a391665c01daae78d8f8a9a105420b0218