mergetools / bc3on commit Merge branch 'mk/diff-shortstat-dirstat-fix' into maint (a4b4f9b)
   1. "$MERGE_TOOLS_DIR/bc"