merge-conflicts topic

Magit extension for git-imerge

magit

Better merge conflict support for vscode

pprice

An extract, as complete as I can make it, of content from the revctrl.org wiki

tonyg