Re: [PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed

Thomas Rast writes: > diff --git a/log-tree.c b/log-tree.c > index 30b3063..9b831e9 100644 > --- a/log-tree.c > +++ b/log-tree.c > @@ -11,6 +11,8 @@ > #include "gpg-interface.h" > #include "sequencer.h" > #include "line-log.h" > +#include "cache-tree.h" > +#include "merge-recursive.h" > > s

[PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed

Git has --cc as a very fast inspection tool that shows a brief summary of what a conflicted merge "looks like", and -c/-m as "give me the full information" data dumps. But --cc actually loses information: if the merge lost(!) some changes from one side, that hunk would fully agree with the other s