mergetools / vimdiff2on commit Sync with Git 2.17.1 (7913f53)
   1. "$MERGE_TOOLS_DIR/vimdiff"