Merge branch 'jc/abbrev-auto'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"