alternatives to mergemaster

[Jeffrey Goldberg]

On Sep 6, 2008, at 1:20 PM, Christian Laursen wrote:

> I always run mergemaster in auto upgrade mode. From the man page:
>
> -U          Attempt to auto upgrade files that have not been user  
> modi-
>            fied.
>
> This can also be achieved by putting "AUTO_UPGRADE=yes" in
> /etc/mergemaster.rc.

AUTO_UPGRADE isn't documented in mergemaster(8).

I guess it's time for me to submit my first documentation patch  
(unless someone beats me to it).

Cheers,

-j



-- 
Jeffrey Goldberg                        http://www.goldmark.org/jeff/