help.c: Fix detection of custom merge strategy on cygwin
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>
Thu, 16 Jun 2011 20:22:16 +0000 (21:22 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Jun 2011 22:02:31 +0000 (15:02 -0700)
commitb8a9733...77a648483958bf5472158f7c01641420
treed541bc3...741bdce14279bbd8959886a20ed1d5c3copy hash to clipboard (tree)
parent2c162b5...f370f5c33e6a945e6922d598006c5ec4copy hash to clipboard (diff)
help.c