Merge branch 'bc/format-patch-null-from-line'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"