git-conflicts (npm): Manual merge tool
Keywords: git|merge|tool|mergetool|rebase|marker|conflict|resolution|editor