sickmerge (npm): A git command-line conflict resolution tool. In the browser.
Keywords: sickmerge|git|merge|conflict|command-line|code-mirror|resolution