mergetools / vimdiff3on commit Merge branch 'ta/config-set-1' (7f346e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"