![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Jan 2011 16:26:24 +0000 (08:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Jan 2011 16:26:24 +0000 (08:26 -0800) | ||
| commit | ea9590789fecdf1eb48bba6d8b8cadab3441fbda | |
| tree | ee336b7cbaa3d749f7e069c8deabc3a09ad82d9e | tree | snapshot |
| parent | f8d0215c8111e586d2d811a451aff1848bae4d96 | commit | diff |
| parent | d531174fe386af00755619d6a204db74a30954f8 | commit | diff |
Merge branch 'rj/maint-difftool-cygwin-workaround' into maint
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin