Merge branch 'xy/format-patch-base'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"