On Wed, Apr 6, 2011 at 16:08, Antoine Pitrou <solip...@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
_______________________________________________
python-committers mailing list
python-committers@python.org
http://mail.python.org/mailman/listinfo/python-committers

Reply via email to