mergetools / gvimdiff2on commit Merge branch 'cc/ref-is-hidden-microcleanup' into maint (d0dffca)
   1. "$MERGE_TOOLS_DIR/vimdiff"