mergetools / gvimdiff3on commit Merge branch 'jk/incore-lockfile-removal' into next (603dae7)
   1. "$MERGE_TOOLS_DIR/vimdiff"