Get Mergely

GitHub

git clone https://github.com/wickedest/Mergely

Downloads

Releases

2017-11-04: Version 3.4.5

  • Fixed issue rendering stale changes when lhs/rhs invoked

2017-02-28: Version 3.4.4

  • Added option ignorecase
  • prev/next options will wrap around to start/end

2016-09-07: Version 3.4.3

  • Fixed no-conflict jQuery

2016-07-25: Version 3.4.2

  • Currently selected change can now be styled via css

2016-05-25: Version 3.4.1

  • Fix for merge-button
  • Fix for margin click
  • Fix for optimize

2016-02-07: Version 3.4.0

2015-06-28: Version 3.3.10

  • Added wrap_lines to options
  • Added line_numbers to options
  • Editor now accepts query arguments for changing options
  • Editor now sets query arguments to browser history when default option changes

2014-12-07: Version 3.3.9

  • Fixes scroll synchronization

2014-10-19: Version 3.3.8

  • Updated CodeMirror 4.6

2014-08-17: Version 3.3.7

  • Added scrollToDiff (current change cursor)
  • Added mergeCurrentChange (current change cursor)

2014-01-25: Version 3.3.6

  • Fixes rhs markup problem

2013-11-24: Version 3.3.5

  • Fixed issue where downloaded .diff did not contain text

2013-11-02: Version 3.3.4

  • Fixed update issue when ignorews option was set
  • Fixed relative positioning of editors

2013-06-13: Version 3.3.3

  • Fixed merge issues
  • Fixed scroll-indicator out of alignment with actual source
  • Fixed inner-markup issues
  • Fixed resize issue
  • Setting most options after startup have immediate effect
  • Added search previous
  • Complete redesign of editor

2013-06-13: Version 3.3.2

  • Fixed merge left issue from added source
  • Added option: rhs_margin left/right
  • Added option: viewport enable/disable

2013-05-11: Version 3.3.1

  • Changed inner-line diff algorithm to words, rather than characters
  • Added method: unmarkup to clear markup
  • Added option: viewport color
  • Fixed resize and autoresize

2013-02-24: Version 3.2

  • Support for CodeMirror 3.1
  • Performance greatly improved, especially for large files
  • Added option sidebar to enable sidebars
  • Added option ignorews to ignore white-space
  • Added support for CodeMirror lineWrapping
  • Added option lcs to disable word-by-word changes
  • UI markup changes

2013-02-03: Version 3.1.1

  • Support for jQuery 1.9.0
  • Fixed rendering issue where changes where skipped

2013-01-05: Version 3.1

  • Added ignore white space
  • Fixed editor bug re-applying settings
  • Added options method (with no arguments)

2012-11-03: Version 3.0

  • CodeMirror 3.0 (beta) support
  • Added cm method to access CodeMirror editors
  • Added scrollTo method to support anchors
  • Added options method
  • Added read-only option to left or right editors
  • Margins markup now uses different colours
  • Added autoupdate boolean option
  • Added update method for manual update
  • fgcolor configuration setting is now a object
  • Deprecated bgcolor option for side margin
  • New css markup design

2012-07-31: Version 2.5

  • Fixed canvas width issue

2012-04-09: Version 2.4

  • Added color settings to editor
  • Added downloadable .diff file

2012-02-07: Version 2.3

  • Works with CM 2.21
  • Supports line wrapping
  • Supports CM settings
  • Fixes multiple CM instances
  • Margins have visible window indicator

2012-01-23: Version 2.2

  • Modified to work with CM 2.2

2011-11-28: Version 2.1

  • Fixed LCS markup bug

2011-11-16: 2.0

  • Now a jQuery plugin
  • Multiple file upload
  • Merge fixes
  • File download directly from browser

2011-11-09: Version 1.1

  • Fixed merge left button position

2011-09-29: Version 1.0

  • Initial release