How to perform a three-way diff in Git without merging?
问题 I want to perform a three-way diff between two git branches with a common merge base, and view it with kdiff3. I've found lots of guidance on SO (and a few very similar questions (1, 2, 3) ) but I haven't found a direct answer. Notably, a comment on this answer implies that what I want is possible, but it didn't work for me. Hopefully that user might chime in here :) For background, when I perform merges I use a "diff3" conflict style: git config --global merge.conflictstyle diff3 And I have