webdiff
webdiff copied to clipboard
Add support for merges
The git UI for merges is confusing:
<<<blah
blah
======
blah
>>>blah
It would be nice if webdiff could show the three-way merge.
+1