mergetools / gvimdiff3on commit Merge branch 'sb/status-doc-fix' into maint (e092248)
   1. "$MERGE_TOOLS_DIR/vimdiff"