From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Mar 2011 06:24:27 +0000 (-0700)
Subject: Merge branch 'ss/mergetool--lib'
X-Git-Tag: v1.7.5-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d59e6607a597a0a934566bfa547b45c7b57822c;p=git.git

Merge branch 'ss/mergetool--lib'

* ss/mergetool--lib:
  mergetool--lib: Add Beyond Compare 3 as a tool
  mergetool--lib: Sort tools alphabetically for easier lookup
---

9d59e6607a597a0a934566bfa547b45c7b57822c