Re: show all merge conflicts

Michael J Gruber [off-list ref] writes:

If you're curious, I kept rebasing Thomas' remerge-diff (on top of our
next) so far. You can find it at

https://github.com/mjg/git/tree/remerge-diff

;-).
Yes, this was a good one.  

if you're interested. I don't know what problems were found back then,
or what it would take to get this in-tree now.

If I recall correctly, everybody was in favor of what it does (or at
least attempted to do), but was leaky and not ready for "log -p" to
be used on a long stretch of history or something?