Merge branch 'js/replace-edit-use-editor-configuration'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"