Merge branch 'tr/fd-gotcha-fixes'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"