From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 06:57:19 +0000 (-0800)
Subject: Merge branch 'tr/userdiff-c-returns-pointer'
X-Git-Tag: v1.7.9-rc0~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6;p=git.git

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

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

357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6