author | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Dec 2010 20:51:11 +0000 (12:51 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 23 Dec 2010 20:51:11 +0000 (12:51 -0800) | ||
commit | 73e7b2ef6c62b3ec345b557acb71a8da4798c70d | |
tree | 854951da72e8777ba36576a7278a10b9cc49b133 | tree | snapshot |
parent | 4e3a1b24ad4ee3fc7dc21a8b8f39c41202d6b0a5 | commit | diff |
parent | d531174fe386af00755619d6a204db74a30954f8 | commit | diff |
Merge branch 'rj/maint-difftool-cygwin-workaround'
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin
* rj/maint-difftool-cygwin-workaround:
difftool: Fix failure on Cygwin