summaryrefslogtreecommitdiff
path: root/mergetools/gvimdiff2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-28 09:33:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-28 09:33:15 -0700
commita070d621ed8e84a06ca6b710560c691dbf475b4a (patch)
tree54506d51c1820eeab58be2eaae3752e4e71815fe /mergetools/gvimdiff2
parentMerge branch 'tg/test-index-v4' into maint (diff)
parentsha1fd_check: die when we cannot open the file (diff)
downloadtgif-a070d621ed8e84a06ca6b710560c691dbf475b4a.tar.xz
Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint
Code simplification. * jk/simplify-csum-file-sha1fd-check: sha1fd_check: die when we cannot open the file
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions