Avoid asking about the same conflict twice#133

anordal wants to merge 7 commits intomystor:mainmystor/git-revise:mainfrom

anordal:avoid-asking-about-the-same-conflict-twiceanordal/git-revise:avoid-asking-about-the-same-conflict-twiceCopy head branch name to clipboard