From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:30 +0000 (-0800)
Subject: Merge branch 'da/difftool-dir-diff-fix' into maint
X-Git-Tag: v2.11.1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=935a4783f72964e0fa72995c101542531081b094;p=thirdparty%2Fgit.git

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

"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
---

935a4783f72964e0fa72995c101542531081b094