From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Aug 2016 16:16:57 +0000 (-0700)
Subject: Merge branch 'jk/difftool-in-subdir' into maint
X-Git-Tag: v2.9.3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b601eafd1437df2e11b032bfbfd1ac5d32d3290;p=thirdparty%2Fgit.git

Merge branch 'jk/difftool-in-subdir' into maint

"git difftool <paths>..." started in a subdirectory failed to
interpret the paths relative to that directory, which has been
fixed.

* jk/difftool-in-subdir:
  difftool: use Git::* functions instead of passing around state
  difftool: avoid $GIT_DIR and $GIT_WORK_TREE
  difftool: fix argument handling in subdirs
---

9b601eafd1437df2e11b032bfbfd1ac5d32d3290