On Sat, 30 Dec 2017 10:10:33 -0800, Ian Zimmerman wrote:

> I realized I don't really understand it - I just repeat by rote some
> keystrokes.  In particular:
> 
> What do the 'z' and 'n' commands do exactly, and what's the difference
> between them?
> 
> After I do a 'm', how do I actually use the result of the merge?  Is the
> merged file now the same as the 'new' one, or the same as the 'old' one?
> IOW, if I do 'm' and then 'z', will the merged version be the active
> one?
> 
> Neither manpage nor wiki is of any help answering these.

Can I suggest you try conf-update. I find it far more intuitive than
dispatch-conf and everything you asked is completely obvious in it. Of
course, you may decide you hate it, but it's worth a look to find out.


-- 
Neil Bothwick

Indecision is the key to flexibility.

Attachment: pgp4xeLkqZ8HD.pgp
Description: OpenPGP digital signature

Reply via email to