Merge branch 'jk/symbolic-ref-maint' into maint
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"