help.c: Fix detection of custom merge strategy on cygwin
[gitweb.git] / contrib / examples /
2007-02-14 Merge branch 'jc/deprecate'
2007-02-13 Remove git-resolve.