Merge branch 'tr/userdiff-c-returns-pointer' into maint
* tr/userdiff-c-returns-pointer: userdiff: allow * between cpp funcname words
Junio C Hamano committed
Dec 21, 2011 at 11:42 UTC
f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517
No changes.