vscode-gitlens icon indicating copy to clipboard operation
vscode-gitlens copied to clipboard

Published 20 hours ago • verified publisher icon gitkraken

git show --remerge-diff

Open nicolashenry opened this issue 3 years ago • 0 comments

There is this new feature in git 2.36 named "--remerge-diff" which is great to review the merge conflict resolution in particular to have only the difference with the default merge.

It is maybe a bit too soon but it would be great to have a way to do it from gitlens :) For example, the idea could be to have a "Compare with remerge" in the right click menu on a merge commit.

nicolashenry avatar Jun 21 '22 16:06 nicolashenry