Just want to throw my support in for range-diff since ranges is what
you pass to the command.
Alternatively, diff-diff since that's how I've crudely tried to
accomplish this before.
git diff A..B > diff1
git diff C..D > diff2
winmerge diff1 diff2
edit: Sending again, hopefully without HTML :). Sorry for spamming.
Hi, I think --recreate-merges is a very exciting feature.
I've also been puzzled by why we can't just pick merge commits directly
including
conflict resolutions, so allow me to join the discussion.
On Wed, Feb 7, 2018 at 6:36
2 matches
Mail list logo