From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Nov 2009 00:40:50 +0000 (-0800)
Subject: Merge branch 'sc/difftool-p4merge'
X-Git-Tag: v1.6.6-rc0~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e;p=git.git

Merge branch 'sc/difftool-p4merge'

* sc/difftool-p4merge:
  mergetool--lib: add p4merge as a pre-configured mergetool option
---

9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e