diff options
| author |  Charles Bailey <cbailey32@bloomberg.net> | 2014-10-11 01:39:38 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-10-15 14:12:20 -0700 |
| commit | 4fb4b02d98310f4f859f7d52f57f36d49198be5c (patch) | |
| tree | e0d306e3100bb5f6c19dbe70d44898082b52cbb8 /t/t1002-read-tree-m-u-2way.sh | |
| parent | mergetool: don't require a work tree for --tool-help (diff) | |
| download | tgif-4fb4b02d98310f4f859f7d52f57f36d49198be5c.tar.xz | |
difftool: don't assume that default sh is sane
git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.
Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented for use solely by difftool.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
0 files changed, 0 insertions, 0 deletions