| commit | 7c7584b97096a168fe1236c84e5e12d7bee24476 | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 25 Jul 2012 03:14:22 +0000 (24 20:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jul 2012 16:34:04 +0000 (25 09:34 -0700) | ||
| tree | 173527e44215fd2b434a48d1508f846f52e7fc02 | treesnapshot (tar.gz zip) |
| parent | 1f2293457579a5bf22bb9c8324ded22b10705cc2 | commitdiff |
difftool: Handle finding mergetools/ in a path with spaces
Use the original File::Find implementation from bf73fc2 (difftool:
print list of valid tools with '--tool-help', 2012-03-29) so that we
properly handle mergetools/ being located in a path containing
spaces.
One small difference is that we avoid using a global variable by
passing a reference to the list of tools.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use the original File::Find implementation from bf73fc2 (difftool:
print list of valid tools with '--tool-help', 2012-03-29) so that we
properly handle mergetools/ being located in a path containing
spaces.
One small difference is that we avoid using a global variable by
passing a reference to the list of tools.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-difftool.perl | diffblobblamehistory |