Merge branch 'hd/show-one-mergetag-fix'
[git/raj.git] / mergetools / bc3
blob5d8dd4818488c1aa62750946d5490a99850e63b2
1 . "$MERGE_TOOLS_DIR/bc"