mergetools / vimdiff3on commit Sync with 2.10.5 (0a4986d)
   1. "$MERGE_TOOLS_DIR/vimdiff"