fix(merge): handle conflicts in loom branch merge with continue/abort support#122

narnaud merged 1 commit intomainnarnaud/git-loom:mainfrom

fix-merge-conflictsnarnaud/git-loom:fix-merge-conflictsCopy head branch name to clipboard