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)
commit74b90691b3f1770bcead3e99e65c94780800592a
tree4b75bc746a6c37ad248d03e8a62f23f9dbdba27c
parent81602bc6488fb96b056e7dbd0840af1607de5179
parentd531174fe386af00755619d6a204db74a30954f8
Merge branch 'rj/maint-difftool-cygwin-workaround' into next

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