Merge branch 'kb/avoid-fchmod-for-now'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"