lxm_front/Mergely

mirror of synced 2025-11-06 04:30:40 +08:00

Go to file

zhudock d761609e54 Add wrapdiff option for scrollToDiff next\prev to wrap to start\end of text. resolves #57

2017-02-28 15:55:52 -05:00

Updated documentation for line_numbers and wrap_lines

2015-06-28 12:07:26 +01:00

Fixed no-conflict jQuery

2016-09-07 19:06:47 +01:00

Fixed typo.

2014-08-17 15:39:30 +01:00

Add wrapdiff option for scrollToDiff next\prev to wrap to start\end of text. resolves #57

2017-02-28 15:55:52 -05: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

bower.json

Fixed no-conflict jQuery

2016-09-07 19:06:47 +01:00

LICENSE.html

2.4 changes

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

README.md

Undo test

2015-03-23 13:51:36 +00: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.