Code

Merge branch 'tr/userdiff-c-returns-pointer' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
commitf0b4fd47074d8cf3f9db9c444c8e1e125e0cc517
tree075ca6795fc65ac88b949dde126a4ec3d0056ef1
parent406cc9b822b44a1d53c1a45536460992529aec88
parent37e7793d473019eac69c347f1a79e3273567b9bf
Merge branch 'tr/userdiff-c-returns-pointer' into maint

* tr/userdiff-c-returns-pointer:
  userdiff: allow * between cpp funcname words
userdiff.c