![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
| commit | 74b90691b3f1770bcead3e99e65c94780800592a | |
| tree | 4b75bc746a6c37ad248d03e8a62f23f9dbdba27c | tree | snapshot |
| parent | 81602bc6488fb96b056e7dbd0840af1607de5179 | commit | diff |
| parent | d531174fe386af00755619d6a204db74a30954f8 | commit | diff |
Merge branch 'rj/maint-difftool-cygwin-workaround' into next
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin