Jakub Narebski <jnareb@xxxxxxxxx> writes:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
> > * kk/gitweb-side-by-side-diff (2011-10-17) 2 commits
> > - gitweb: add a feature to show side-by-side diff
> > - gitweb: change format_diff_line() to remove leading SP from $diff_class
> >
> > Fun.
> > Will keep in 'pu' until the planned re-roll comes.
>
> I think this needs some more work, not only re-roll...
>
>
> BTW. the bottom commit could be I think replaced by mine
>
> - gitweb: Refactor diff body line classification
Nb. that needs a easy but non-trivial merge conflict resolution,
see e.g.
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
The following changes since commit 8963314c77af9a4eda5dcbdbab3d4001af83ad81:
Sync with maint (2011-10-21 11:24:34 -0700)
are available in the git repository at:
git://repo.or.cz/git/jnareb-git.git gitweb/side-by-side-diff
Jakub Narebski (1):
gitweb: Refactor diff body line classification
Kato Kazuyoshi (1):
gitweb: add a feature to show side-by-side diff
gitweb/gitweb.perl | 144 ++++++++++++++++++++++++++++++++++------------
gitweb/static/gitweb.css | 15 +++++
2 files changed, 123 insertions(+), 36 deletions(-)
--
Jakub Narebski
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html