Merge branch 'oc/mergetools-beyondcompare'

* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc

Junio C Hamano committed Oct 29, 2014 at 10:08 UTC c1777a297043a06d6c18d383d17447f5eefcdcbe

No changes.