From: Junio C Hamano 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.lorimer.id.au/gitweb.git/diff_plain/ea9590789fecdf1eb48bba6d8b8cadab3441fbda?ds=inline;hp=--cc Merge branch 'rj/maint-difftool-cygwin-workaround' into maint * rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin --- ea9590789fecdf1eb48bba6d8b8cadab3441fbda