Code

Merge branch 'rj/maint-difftool-cygwin-workaround'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:11 +0000 (12:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:11 +0000 (12:51 -0800)
* rj/maint-difftool-cygwin-workaround:
  difftool: Fix failure on Cygwin


Trivial merge