From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:26:52 +0000 (-0700)
Subject: Merge branch 'da/difftool-git-files'
X-Git-Tag: v2.0.0-rc0~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26696382ecc3fd9895da117311d234501127cf81;p=thirdparty%2Fgit.git

Merge branch 'da/difftool-git-files'

"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual
file ".git" tells us where it is.

* da/difftool-git-files:
  t7800: add a difftool test for .git-files
  difftool: support repositories with .git-files
---

26696382ecc3fd9895da117311d234501127cf81