commit | 01e13d0221e73febdcb98e26b4ae2882887421d8 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Mar 18 14:04:36 2014 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Mar 18 14:04:36 2014 -0700 |
tree | 42ef3c061af3cdd78fa78797b2fcec423611032c | |
parent | 4097a25429d09b61616845fbe6551587a30fa038 [diff] | |
parent | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 [diff] |
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