[Pmwiki-users] CVS features was: discussion on line breaks

Jonathan Scott Duff duff
Tue Aug 12 09:28:01 CDT 2003

On Tue, Aug 12, 2003 at 08:42:45AM -0600, Patrick R. Michaud wrote:
> On the other hand, as I write this now, my reluctance to use merge(1)
> seems a bit silly to me--if merge is available, then make use of it to
> resolve edit conflicts when they occur, if not, then posts continue to 
> work as they always have.

How do you know when to apply merge(1)? Will each edit have to be
submitted along with the revision number it is editing?  

Jonathan Scott Duff
duff at cbi.tamucc.edu

More information about the pmwiki-users mailing list