Merge branch 'jn/rerere-fail-on-auto-update-failure'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"