Merge branch 'jk/push-simple'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"