From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Dec 2010 20:51:11 +0000 (-0800)
Subject: Merge branch 'rj/maint-difftool-cygwin-workaround'
X-Git-Tag: v1.7.4-rc0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=73e7b2ef6c62b3ec345b557acb71a8da4798c70d;p=git.git

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

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

73e7b2ef6c62b3ec345b557acb71a8da4798c70d