Merges and Diffs
Code Mirror has a great example of using the Google Diff Match Patch library to implement a two and three way merge.
The example is here, but it's not too clear because the CSS has things too constrained. To fix it, open the Chrome Web tools (or equivalent), in the elements tab select the <article> tab, and remove (uncheck or delete) the margin: and the max-width: entries.
The library is available through bower and seems to work just fine.
The example is here, but it's not too clear because the CSS has things too constrained. To fix it, open the Chrome Web tools (or equivalent), in the elements tab select the <article> tab, and remove (uncheck or delete) the margin: and the max-width: entries.
The library is available through bower and seems to work just fine.
Comments
Post a Comment