sickmergeA git command-line conflict resolution tool. In the browser.sickmergegitmergeconflictcommand-linecode-mirrorresolution0.0.3 • Published 11 years ago