summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2016-09-07 16:36:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 13:46:46 -0700
commitfb33b62ca6e6dbfa8a5330cb0535fe122e250b5f (patch)
tree081efb50706257ebb3422142c6a14be1bcfc56ce /git-mergetool.sh
parentGit 2.10 (diff)
downloadtgif-fb33b62ca6e6dbfa8a5330cb0535fe122e250b5f.tar.xz
diff.c: use diff_options directly
The value of `ecbdata->opt` is accessible via the short variable `o` already, so let's use that instead. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions