mergetools / bc3on commit Merge branch 'jc/diff-no-index-d-f' into maint-2.3 (cd01208)
   1. "$MERGE_TOOLS_DIR/bc"