diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:35:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:35:53 -0800 |
| commit | 05849c4818342a0e0ecb597fd2452125b00d543e (patch) | |
| tree | a597a80c0248767405b9bbc18c5e8b88b64fe46c /git-merge-resolve.sh | |
| parent | 077ad4a0f20a4b7288ba001a5bb33742ff56e9fa (diff) | |
| parent | 048b3991924a0666a2ab4f381caac8d62962de38 (diff) | |
| download | git-05849c4818342a0e0ecb597fd2452125b00d543e.tar.gz git-05849c4818342a0e0ecb597fd2452125b00d543e.tar.xz | |
Merge branch 'rh/maint-gitweb-highlight-ext'
Fixes a clever misuse of perl's list interpretation.
* rh/maint-gitweb-highlight-ext:
gitweb.perl: fix %highlight_ext mappings
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions