From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 20:57:17 +0000 (-0800)
Subject: Merge branch 'jn/ancient-meld-support'
X-Git-Tag: v1.7.10-rc0~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=746b6fb96852accae8a4163f6edda23a4c6de0c7;p=git.git

Merge branch 'jn/ancient-meld-support'

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

746b6fb96852accae8a4163f6edda23a4c6de0c7