From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Dec 2011 19:42:45 +0000 (-0800)
Subject: Merge branch 'tr/userdiff-c-returns-pointer' into maint
X-Git-Tag: v1.7.8.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517;p=git.git

Merge branch 'tr/userdiff-c-returns-pointer' into maint

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

f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517