Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

This branch is 1125 commits ahead, 5 commits behind localwiki:master

Fetching latest commit…

Cannot retrieve the latest commit at this time

..
Failed to load latest commit information.
WEB-INF
css
examples/basic_1
images
js
lib
src
.gitignore
LICENSE.txt
NOTICE.txt
README
README_daisydiff.txt
build.xml
test_form.html

README

This is a version of the daisydiff HTML diffing library that's we've modified
in a few ways.  Some noteworthy changes:

  * Diffing is rendered in the classic wiki side-by-side manner.
  * Diffing can be provided as a service rather than simply via a
    command-line app.  This dramatically improves performance.
  * Three-way merging is supported.  This is essential for resolving
    wiki edit conflicts.

Modifications will be pushed upstream where possible.  We will likely continue
improving this version of daisydiff and figure out what we want to do[1] at a
later, better point.

------
1. It doesn't look like DaisyDiff has been actively maintained in some while.
We may end up carrying the torch on this one.  We may end up rewriting this in
python at some point, too.
Something went wrong with that request. Please try again.