Merge branch 'jk/delete-modechange-conflict' into maint
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"