From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:33 +0000 (-0800)
Subject: Merge branch 'da/difftool-dir-diff-fix'
X-Git-Tag: v2.12.0-rc0~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afe0e2a391665c01daae78d8f8a9a105420b0218;p=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