Merge branch 'jk/fast-import-die-nicely-fix'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"