Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tr/userdiff-c-returns-pointer' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Dec 2011 19:42:45 +0000
(11:42 -0800)
committer
Junio 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
raw
|
combined
(merge:
406cc9b
37e7793
)
diff --cc
userdiff.c
Simple merge