From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 21:04:36 +0000 (-0700)
Subject: Merge branch 'da/difftool-git-files' into maint
X-Git-Tag: v1.9.1~2
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/01e13d0221e73febdcb98e26b4ae2882887421d8

Merge branch 'da/difftool-git-files' into maint

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

01e13d0221e73febdcb98e26b4ae2882887421d8