mismerge

A modern merge editor for the Web. Maintained by BearToCode on GitHub, where it has earned 71 stars from the community.

It's actively developed around diff, editor, merge, and is a solid reference for anyone building with these tools.