Merge branch 'rj/maint-difftool-cygwin-workaround' into maint
commitea9590789fecdf1eb48bba6d8b8cadab3441fbda
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2011 16:26:24 +0000 (19 08:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Jan 2011 16:26:24 +0000 (19 08:26 -0800)
treeee336b7cbaa3d749f7e069c8deabc3a09ad82d9e
parentf8d0215c8111e586d2d811a451aff1848bae4d96
parentd531174fe386af00755619d6a204db74a30954f8
Merge branch 'rj/maint-difftool-cygwin-workaround' into maint

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