diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:14:40 -0800 |
| commit | a558332f5eda1f9d4cb4abe0e68062c625e5049f (patch) | |
| tree | afdbb6a80b0714ddbdf7e67f8ac69f2772d8e780 /t/t9824-git-p4-git-lfs.sh | |
| parent | Merge branch 'ld/p4-compare-dir-vs-symlink' into maint (diff) | |
| parent | difftool: rename variables for consistency (diff) | |
| download | tgif-a558332f5eda1f9d4cb4abe0e68062c625e5049f.tar.xz | |
Merge branch 'jk/difftool-in-subdir' into maint
Even though an fix was attempted in Git 2.9.3 days, but running
"git difftool --dir-diff" from a subdirectory never worked. This
has been fixed.
* jk/difftool-in-subdir:
difftool: rename variables for consistency
difftool: chdir as early as possible
difftool: sanitize $workdir as early as possible
difftool: fix dir-diff index creation when in a subdirectory
Diffstat (limited to 't/t9824-git-p4-git-lfs.sh')
0 files changed, 0 insertions, 0 deletions