Merge branch 'tz/doc-show-defaults-to-head'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"