[PATCH] Merging the Cygwin changes
commitc8c5b21a3714db3272f869c82f3ce862ed9c2cc6
authorJunio C Hamano <junkio@cox.net>
Mon, 3 Oct 2005 23:05:50 +0000 (3 16:05 -0700)
committerPeter Anvin <hpa@tazenda.sc.orionmulti.com>
Mon, 3 Oct 2005 23:29:48 +0000 (3 16:29 -0700)
treeb9f84c3ddee69e398106b1c6fbbc5ddb72875080
parent79a9d8ea0d88a3667ad19be8e705405ab5d896f1
[PATCH] Merging the Cygwin changes

Fix mismerge typo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile