[python-committers] Fwd: [Python-checkins] cpython (merge 2.7 -> 2.7): hg pull/merge - Changes to accomodate.

[Dirkjan Ochtman]

On Wed, Apr 6, 2011 at 16:08, Antoine Pitrou <solipsis at pitrou.net> wrote:
> I think the representation of merges as a diff against one of the
> parents is indeed sub-optimal. OTOH, it's not easy to come up with
> something better.

This might be of interest: https://bitbucket.org/wolever/hg-mergediff/.

Cheers,

Dirkjan