[PATCH 1 of 1] hgmerge revamp

[Matt Mackall]

On Sun, Jan 29, 2006 at 05:09:05PM +0100, "Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl>"@zen.uplink wrote:
> # HG changeset patch
> # User "Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl>"
> # Node ID 36be990fe0d16b8793ad276659567d49623a1b63
> # Parent  b2df93c56ac47c24c46e193c5afdc5a6f687c8a6
> hgmerge revamp
> 
> Details:
>   - reduced code duplication
>   - global cleanup functions
>   - additional variables to override paths of external utilites

Rewrites are trouble. I can't look at this patch and say, "yes, it's
all obviously correct" because there are too many unrelated changes
happening at the same time. It also makes it harder for both of us if
I want to reject or revert a particular piece.

Please do this sort of change one step at a time. Breaking it up by
your bullet points above would probably be fine.

This will have to wait until after 0.8 at any rate.

-- 
Mathematics is the supreme nostalgia of our time.