mergetools / gvimdiff3on commit Merge branch 'jk/config-lockfile-leak-fix' into next (7b91d71)
   1. "$MERGE_TOOLS_DIR/vimdiff"