Merge branch 'jk/format-patch-from'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"