mergetools / gvimdiff2on commit Merge branch 'du/rev-parse-is-plumbing' into maint (95500c8)
   1. "$MERGE_TOOLS_DIR/vimdiff"