From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:41:51 +0000 (-0700)
Subject: Merge branch 'da/mergetool-lib'
X-Git-Tag: v1.6.4-rc0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbc0995792880d9f87f5c1a871f5f55b7284c7f1;p=thirdparty%2Fgit.git

Merge branch 'da/mergetool-lib'

* da/mergetool-lib:
  mergetool--lib: specialize diff options for emerge and ecmerge
---

bbc0995792880d9f87f5c1a871f5f55b7284c7f1