mergetools / bc3on commit Merge branch 'jk/diff-color-moved-fix' into maint (fd50623)
   1. "$MERGE_TOOLS_DIR/bc"