On Thu, 2004-02-12 at 18:05 -0500, David Wendt wrote:
"There is, however, one major caveat with using `-kk' on merges. Namely, it overrides whatever keyword expansion mode CVS would normally have used. In particular, this is a problem if the mode had been `-kb' for a binary file. Therefore, if your repository contains binary files, you will need to deal with the conflicts rather than using `-kk'."
Is it possible we could merge using -kb, or is this impossible?
My reading of the above paragraph is that you get either keyword expansion suppression (-kk), OR proper treatment of binary files (-kb), but not both.
~ESP