summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 13:52:28 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-28 13:52:28 -0700
commit27ee56f9db26fb863f5f449cb3e7dade932f953a (patch)
tree480a9d71f43036b1f3106dcc6fe454877cd2936c /mergetools/opendiff
parentfd7c41ec9745a4df199492b1736c9821b6c1028f (diff)
parent37e61153e2a2633ef3c9cfbe988b9d80ac809ee7 (diff)
downloadgit-27ee56f9db26fb863f5f449cb3e7dade932f953a.tar.gz
Merge branch 'jk/quote-env-path-list-component' into maint
A test fix. * jk/quote-env-path-list-component: t5615: fix a here-doc syntax error
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions