cherry-pick/revert: add scissors line on merge conflict
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"