6 Apr
2011
6 Apr
'11
2:12 p.m.
On Wed, Apr 6, 2011 at 16:08, Antoine Pitrou <solipsis@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