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. -- Please don't Cc: me privately on mailing lists and Usenet, if you also post the followup to the list or newsgroup. To reply privately _only_ on Usenet, fetch the TXT record for the domain.
