From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2012 23:33:07 +0000 (-0800)
Subject: Merge branch 'jn/ancient-meld-support' into maint
X-Git-Tag: v1.7.9.3~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea;p=git.git

Merge branch 'jn/ancient-meld-support' into maint

* jn/ancient-meld-support:
  mergetools/meld: Use --help output to detect --output support
---

bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea