update -j -kk (was RE: [cvsnt] Re: Corrupted Word Doc)

[Tony Hoyle]

Glen Starrett wrote:
> I certainly agree there should be some better solution, but I don't know 
> what it is.  Falling back to the "it's not recommended to commit 
> binaries" doesn't really work in practice in a lot of cases.
> 
> Tony, do you have some recommendation for this?

The code does an implicit -kk where necessary but this doesn't work in 
all cases (mostly due to the way the files are stored).  -k-v might work 
but it likely to have some of the same issues.

Ultimately the files are different and it's a lot harder than simple -k 
options... it may require a custom diff to be able to ignore certain 
differences (something I started working on but haven't done much with).

Tony