Merge branch 'ab/unconditional-free-and-null'
[git/gitweb.git] / mergetools / bc3
blob5d8dd4818488c1aa62750946d5490a99850e63b2
1 . "$MERGE_TOOLS_DIR/bc"