mergetools / gvimdiffon commit Merge branch 'tz/doc-show-defaults-to-head' into next (fa21fb2)
   1. "$MERGE_TOOLS_DIR/vimdiff"