mergetools / vimdiff2on commit Merge branch 'nd/branch-error-cases' into maint (307d68e)
   1. "$MERGE_TOOLS_DIR/vimdiff"