From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:36 +0000 (-0700)
Subject: Merge branch 'rj/config-cygwin'
X-Git-Tag: v1.7.7-rc0~103
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=551d75dbd80cb6af08376ea8a12bdaa3f5860f35;p=git.git

Merge branch 'rj/config-cygwin'

* rj/config-cygwin:
  config.c: Make git_config() work correctly when called recursively
  t1301-*.sh: Fix the 'forced modes' test on cygwin
  help.c: Fix detection of custom merge strategy on cygwin
---

551d75dbd80cb6af08376ea8a12bdaa3f5860f35