diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:46:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:46:57 -0800 |
| commit | 6fa625a6b757b6aaaf4aaca64a5bd8c038cfb1e8 (patch) | |
| tree | 65a1e688f0d5c2cad744de4217464356cf81d704 /builtin/merge.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | gitweb: Add navigation to select side-by-side diff (diff) | |
| download | tgif-6fa625a6b757b6aaaf4aaca64a5bd8c038cfb1e8.tar.xz | |
Merge branch 'jn/gitweb-side-by-side-diff'
* jn/gitweb-side-by-side-diff:
gitweb: Add navigation to select side-by-side diff
gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"
t9500: Add basic sanity tests for side-by-side diff in gitweb
t9500: Add test for handling incomplete lines in diff by gitweb
gitweb: Give side-by-side diff extra CSS styling
gitweb: Add a feature to show side-by-side diff
gitweb: Extract formatting of diff chunk header
gitweb: Refactor diff body line classification
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions