diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:57:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:57:19 -0800 |
| commit | 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6 (patch) | |
| tree | 494aaff8a38b7d71c9b23b8c4176b27de433e3fb /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'bc/maint-apply-check-no-patch' (diff) | |
| parent | userdiff: allow * between cpp funcname words (diff) | |
| download | tgif-357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6.tar.xz | |
Merge branch 'tr/userdiff-c-returns-pointer'
* tr/userdiff-c-returns-pointer:
userdiff: allow * between cpp funcname words
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions