Code

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


Trivial merge