summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-09 14:01:00 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-09 14:01:00 +0900
commit2e956f7fb3fc21fb43b788fa4c6a02712b33ee26 (patch)
tree8b0e5ad17bec336cae38cb725bd46e12cf1fd644 /builtin/difftool.c
parentMerge branch 'rs/convert-fix-utf-without-dash' (diff)
parentgit-p4: auto-delete named temporary file (diff)
downloadtgif-2e956f7fb3fc21fb43b788fa4c6a02712b33ee26.tar.xz
Merge branch 'pm/p4-auto-delete-named-temporary'
* pm/p4-auto-delete-named-temporary: git-p4: auto-delete named temporary file
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions