Merge branch 'tb/config-core-filemode-check-on-broken-fs'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"