| commit | 26696382ecc3fd9895da117311d234501127cf81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:26:52 +0000 (14 14:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Mar 2014 21:26:52 +0000 (14 14:26 -0700) | ||
| tree | ceaf3a3bf3d488b408eb51903af06c0fc0714df8 | treesnapshot (tar.gz zip) |
| parent | 13b49f1e7463c46272c0b3b9b1952dc519086b6d | commitdiff |
| parent | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 | commitdiff |
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
"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