mergetools / gvimdiff3on commit Sync with Git 2.16.4 (68f95b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"