The base version of a merge conflict is ignored about difftastic HOT 2 OPEN

Yeah, this would be a reasonable addition. Note that there's no guarantee that a base version is present, but I agree the diff3 is easier to reason about.

I'm not sure what's the best way to display this though. Difftastic assumes a 2-way diff, so if I simply all of base against the left and all of base against the right, you end up scrolling a lot to compare each case.

from difftastic.

I've been using a script I hacked together to generate two diffs and present them both with xxdiff, which looks like the delta example above.

What I decided on was to show just the first conflict section found in the file, and I will iterate on fixing each conflict, saving the file, and running this tool again to see the next conflict.

I would love to see difftastic have a command line option to make it behave similarly. I wouldn't want to see all the diffs all at once, I just want to see them one pair at a time as I'm working on resolving the conflicts. I would settle for two options to make it show either all the B -> X diffs at once or all the B -> Y diffs. But what is most important to me is being able to see the two diffs at the same time and visually check how to apply both changes correctly.

Sometimes a single logical code change gets broken up into multiple conflicts, and then going conflict-by-conflict doesn't work well. It would be mind blowing if there was a way to see a range of conflicts (by index number?) combined into a single pair of diffs.

from difftastic.