mergetools / gvimdiff2on commit Merge branch 'ah/log-decorate-default-to-auto' into maint (fb11de9)
   1. "$MERGE_TOOLS_DIR/vimdiff"