lxm_front/Mergely

mirror of https://github.com/wickedest/Mergely.git synced 2026-02-02 09:38:00 +08:00

Go to file

Jamie Peabody c382afa2a5 Fixed setting lhs/rhs using CodeMirror's setValue.

2013-03-03 22:45:56 +00:00

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +00:00

Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

2013-02-24 21:57:25 +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

Fixed setting lhs/rhs using CodeMirror's setValue.

2013-03-03 22:45:56 +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

2.4 changes

2012-04-09 19:23:33 +01: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. I can be used within your own web application to compare files, text, C, C++, Java, HTML, XML, CSS, and Javascript.