Merge branch 'sg/t3600-nul-sha1-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"