[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: nonmergeable file needs merge

From: Paul Sander
Subject: Re: nonmergeable file needs merge
Date: Thu, 29 Nov 2001 16:12:05 -0800

Have you looked into using -ko for this purpose?

--- Forwarded mail from address@hidden

By the way, the reason I'm using -k 'b' is so that there is no
substitution....but these should be all mergeable text files.

--- End of forwarded message from address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]