liuxm/Mergely

forked from lxm_front/Mergely

Go to file

Jamie Peabody 8b3859de40 Merge branch 'master' of https://github.com/wickedest/Mergely

2014-03-10 20:30:37 +00:00

Complete rewrite of the editor. Added search previous. Minor bug fixes include: issues with merging; scroll indicator out of alignment with actual source; inner-markup; resize.

2013-06-24 20:20:19 +01:00

Fixes rendering issue.

2014-01-25 12:24:01 +00:00

New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize.

2013-05-12 19:52:47 +01:00

Fixes parsing diffs that contains text that looks like a valid diff, but clearly is not.

2014-03-10 20:28:15 +00:00

Fixed rendering issue where changes were skipped. Upgraded to work with jquery 1.9.0.

2013-02-03 21:00:30 +00:00

.gitattributes

Added .gitattributes

2012-11-15 20:02:56 +00:00

LICENSE.html

2.4 changes

2012-04-09 19:23:33 +01:00

README.md

Beautify README

2014-03-03 16:43:55 +02:00

README.md

Mergely

An online diff/merge application

Mergely is an online diff/merge editor and Javascript library that highlights changes in similar texts.

It can be used within your own web application to compare files, text, C, C++, Java, HTML, XML, CSS, and Javascript.