Hacker News new | ask | show | jobs
by samsquire 1492 days ago
I thought of using Myers algorithm for seamless merging of concurrent updates as this would allow similar strings to remain.
1 comments

I was interested so I implemented diff3 at HTTPS://GitHub.com/samsquire/text-diff

It doesn't handle conflicts at this time. If the text can be automerged it shall be.