commit | f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Dec 21 11:42:45 2011 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Dec 21 11:42:45 2011 -0800 |
tree | 075ca6795fc65ac88b949dde126a4ec3d0056ef1 | |
parent | 406cc9b822b44a1d53c1a45536460992529aec88 [diff] | |
parent | 37e7793d473019eac69c347f1a79e3273567b9bf [diff] |
Merge branch 'tr/userdiff-c-returns-pointer' into maint * tr/userdiff-c-returns-pointer: userdiff: allow * between cpp funcname words