git-imerge icon indicating copy to clipboard operation
git-imerge copied to clipboard

Published 20 hours ago • verified publisher icon mhagger

GitRepository.manualmerge(): turn off rerere

Open mhagger opened this issue 1 year ago • 0 comments

Turn off git-rerere when initiating a manual merge, just as we already do when automerging.

This might fix the problem reported in #161.

mhagger avatar Aug 09 '22 15:08 mhagger