Merge branch 'ds/fetch-disable-force-notice'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"