Support a merge with conflicting gitlink change
[gitweb.git] / ws.c
2007-12-09 Merge branch 'jc/spht'
2007-12-06 Use gitattributes to define per-path whitespace rule