Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'
[git] / mergetools / bc3
1 . "$MERGE_TOOLS_DIR/bc"