Merge branch 'xy/format-patch-prereq-patch-id-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"