diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:02 -0700 |
| commit | 8699b74ae1190b90facdbe83a879251c8a9e07ac (patch) | |
| tree | f92ce3547ca3bdd0e39ae3e245489dce74489b93 /builtin/merge-tree.c | |
| parent | Merge branch 'jc/clear-pathspec' (diff) | |
| parent | userdiff: add built-in pattern for CSS (diff) | |
| download | tgif-8699b74ae1190b90facdbe83a879251c8a9e07ac.tar.xz | |
Merge branch 'wd/userdiff-css'
Update the funcname definition to support css files.
* wd/userdiff-css:
userdiff: add built-in pattern for CSS
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions