From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2014 17:08:03 +0000 (-0700)
Subject: Merge branch 'oc/mergetools-beyondcompare'
X-Git-Tag: v2.2.0-rc0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1777a297043a06d6c18d383d17447f5eefcdcbe;p=thirdparty%2Fgit.git

Merge branch 'oc/mergetools-beyondcompare'

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

c1777a297043a06d6c18d383d17447f5eefcdcbe