Junio C Hamano a558332f5e 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

2017-01-17 15:14:40 -08:00

12 KiB

Executable File

Raw Blame History

View Raw