mergetools / gvimdiffon commit Merge branch 'jc/push-default-explicit' into maint (af04b11)
   1. "$MERGE_TOOLS_DIR/vimdiff"