Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix
[alt-git.git] / mergetools / vimdiff3
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"