summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-21 11:42:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-21 11:42:45 -0800
commitf0b4fd47074d8cf3f9db9c444c8e1e125e0cc517 (patch)
tree075ca6795fc65ac88b949dde126a4ec3d0056ef1 /builtin/diff.c
parentMerge branch 'bc/maint-apply-check-no-patch' into maint (diff)
parentuserdiff: allow * between cpp funcname words (diff)
downloadtgif-f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517.tar.xz
Merge branch 'tr/userdiff-c-returns-pointer' into maint
* tr/userdiff-c-returns-pointer: userdiff: allow * between cpp funcname words
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions