Detect conflicts during merge conflict#508

atanasdinov wants to merge 1 commit into

SUSE:mainSUSE/elemental:mainfrom

atanasdinov:three-way-mergeatanasdinov/elemental:three-way-mergeCopy head branch name to clipboard