From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Aug 2011 23:00:43 +0000 (-0700)
Subject: Merge branch 'da/difftool-mergtool-refactor'
X-Git-Tag: v1.7.7-rc0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f1c70f717da3c9ec6ae3744593c7f9f3729aad7;p=git.git

Merge branch 'da/difftool-mergtool-refactor'

* da/difftool-mergtool-refactor:
  mergetools/meld: Use '--output' when available
  mergetool--lib: Refactor tools into separate files
  mergetool--lib: Make style consistent with git
  difftool--helper: Make style consistent with git
---

3f1c70f717da3c9ec6ae3744593c7f9f3729aad7