Merge branch 'jk/format-patch-number-singleton-patch-with-cover'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"