mergetools / gvimdiff2on commit Merge branch 'mg/log-decorate-HEAD' into maint (5efef30)
   1. "$MERGE_TOOLS_DIR/vimdiff"