From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 27 Oct 2014 21:14:42 GMT
Subject: Re: [PATCH] merge & sequencer: turn "Conflicts:" hint into a comment
Message-ID: <20141027211441.GH5500@google.com>
In-Reply-To: <20141026185909.GC18144@peff.net>

Jeff King wrote:

> For the most part, combined-diff (and --cc) will show the interesting
> cases anyway. But if you take a whole file from one side of the merge,
> then there is nothing interesting for diff to show. Do people still want
> to get that more complete list of potentially interesting files? And if
> so, how do they do it?  I think there really isn't a great way besides
> repeating the merge.

If you have time to experiment with tr/remerge-diff from pu[1], that
would be welcome.

Maybe some day it can be the default behavior for 'log -p'.

> If that is the only casualty, I think it is probably a net-win.

Yes.

Thanks,
Jonathan

[1] http://thread.gmane.org/gmane.comp.version-control.git/256591