mergetools / vimdiff3on commit Merge branch 'sb/prepare-revision-walk-error-check' (715b63c)
   1. "$MERGE_TOOLS_DIR/vimdiff"