Merge branch 'tr/userdiff-c-returns-pointer'
* tr/userdiff-c-returns-pointer: userdiff: allow * between cpp funcname words
Junio C Hamano committed
Dec 13, 2011 at 22:57 UTC
357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6
No changes.