Merge branch 'mk/diff-shortstat-dirstat-fix'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"