![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jul 2011 21:31:36 +0000 (14:31 -0700) |
* 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
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
Trivial merge