From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Jan 2011 16:26:24 +0000 (-0800)
Subject: Merge branch 'rj/maint-difftool-cygwin-workaround' into maint
X-Git-Tag: v1.7.4-rc3~5^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ea9590789fecdf1eb48bba6d8b8cadab3441fbda;p=git.git

Merge branch 'rj/maint-difftool-cygwin-workaround' into maint

* rj/maint-difftool-cygwin-workaround:
  difftool: Fix failure on Cygwin
---

ea9590789fecdf1eb48bba6d8b8cadab3441fbda