summaryrefslogtreecommitdiff
path: root/t/t9603/cvsroot/module/b,v
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-08 13:15:04 -0700
commitb7bd70ddd4d38b16a1af6975df8077306ee998da (patch)
tree070e538c7e1a6c9e750a96b66eb293678309c03c /t/t9603/cvsroot/module/b,v
parentMerge branch 'ab/cmd-foo-should-return' (diff)
parentmergetools/kdiff3: make kdiff3 work on Windows too (diff)
downloadtgif-b7bd70ddd4d38b16a1af6975df8077306ee998da.tar.xz
Merge branch 'ms/mergetools-kdiff3-on-windows'
On Windows, mergetool has been taught to find kdiff3.exe just like it finds winmerge.exe. * ms/mergetools-kdiff3-on-windows: mergetools/kdiff3: make kdiff3 work on Windows too
Diffstat (limited to 't/t9603/cvsroot/module/b,v')
0 files changed, 0 insertions, 0 deletions