mergetools / gvimdiff2on commit help: respect new common command grouping (2241477)
   1. "$MERGE_TOOLS_DIR/vimdiff"