Add proper three-way diff view

Browse Source

...

This commit is contained in:

Nick O'Leary

2016-12-15 20:41:53 +00:00

parent f143a6ba08

commit d3dfbc3034

2 changed files with 894 additions and 220 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

872

editor/js/ui/diff.js

File diff suppressed because it is too large Load Diff