]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 406cc9b 37e7793)
Merge branch 'tr/userdiff-c-returns-pointer' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000 (11:42 -0800)
* tr/userdiff-c-returns-pointer:
  userdiff: allow * between cpp funcname words

1  2 
userdiff.c patch | diff1 | diff2 | blob | history

diff --cc userdiff.c
Simple merge
Git - the stupid content tracker