On Sat, Dec 25, 2021 at 07:59:11AM +0000, Elijah Newren via GitGitGadget wrote: > Here are some example commits you can try this out on (with git show > --remerge-diff $COMMIT): > > * git.git conflicted merge: 07601b5b36 > * git.git non-conflicted change: bf04590ecd > * linux.git conflicted merge: eab3540562fb > * linux.git non-conflicted change: 223cea6a4f05 > > Many more can be found by just running git log --merges --remerge-diff in > your repository of choice and searching for diffs (most merges tend to be > clean and unmodified and thus produce no diff but a search of '^diff' in the > log output tends to find the examples nicely). > > Some basic high level details about this new option: > > * This option is most naturally compared to --cc, though the output seems > to be much more understandable to most users than --cc output. Agreed. --cc is *simple* but I'm more comfortable reading conflict markers from --remerge-diff, since I'm used to that. So at least for content conflicts it looks simpler.
