[Top][All Lists]

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


From: Derek Scherger
Subject: merge/diff
Date: Fri, 02 Mar 2001 15:52:03 -0700

So I'm sitting here, in merge hell with one particular file that has had
lots of cosmetic (whitespace) changes since being branched, thinking to
myself that this would be much easier if I could get the merge to behave
a little bit more like cvs diff -bw (ignore whitespace) does. 

Is there any way to control the diffing done by cvs update -j so that it
ignores whitespace differences? At the moment I'm reduced to manually
applying the changes that cvs diff -bw sees rather than trying to fix up
the conflicts caused by merging. Neither situation is particularly
pleasant however!

Thanks for any great ideas.


reply via email to

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