Merge branch 'jt/format-patch-from-config'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"