mergetools / vimdiff3on commit Merge branch 'jk/merge-base-fork-point-without-reflog' into maint (96ec83c)
   1. "$MERGE_TOOLS_DIR/vimdiff"