sickmerge

A git command-line conflict resolution tool. In the browser.

Browse on unpkg