tree 494aaff8a38b7d71c9b23b8c4176b27de433e3fb
parent b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5
parent 37e7793d473019eac69c347f1a79e3273567b9bf
author Junio C Hamano <gitster@pobox.com> 1323845839 -0800
committer Junio C Hamano <gitster@pobox.com> 1323845839 -0800

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

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