diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-18 02:11:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 02:14:40 +0300 |
| commit | a558332f5eda1f9d4cb4abe0e68062c625e5049f (patch) | |
| tree | afdbb6a80b0714ddbdf7e67f8ac69f2772d8e780 /git-p4.py | |
| parent | aa83f7a2a4a677e9eca4a599f47e027ad06716d1 (diff) | |
| parent | ce6926974ec7b28ad43c387d5aa8ae7ea9f72e65 (diff) | |
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 'git-p4.py')
0 files changed, 0 insertions, 0 deletions