Code

Merge branch 'rj/maint-difftool-cygwin-workaround' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800)
* rj/maint-difftool-cygwin-workaround:
  difftool: Fix failure on Cygwin


Trivial merge