diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2011-12-06 17:35:08 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-06 13:16:37 -0800 |
| commit | 37e7793d473019eac69c347f1a79e3273567b9bf (patch) | |
| tree | 787f815da06f1243830ad0863d33205d36afda79 /Documentation/technical/trivial-merge.txt | |
| parent | Git 1.7.3 (diff) | |
| download | tgif-37e7793d473019eac69c347f1a79e3273567b9bf.tar.xz | |
userdiff: allow * between cpp funcname words
The cpp pattern, used for C and C++, would not match the start of a
declaration such as
static char *prepare_index(int argc,
because it did not allow for * anywhere between the various words that
constitute the modifiers, type and function name. Fix it.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions