mergetools / vimdiff3on commit Merge branch 'bc/fix-rebase-merge-skip' (6293aea)
   1. "$MERGE_TOOLS_DIR/vimdiff"