Andre Poenitz <[EMAIL PROTECTED]> writes:
| > | Thanks for meddling with the math parser and array.C. Its always nice to
| > | clean up merge conflicts after a long weekend.
| >
| > Did you really expect that small cleanups would just ignore mathed?
|
| Sort of. Yes.
One option for you then is to look at what has changed... revert the
changes ... and insert the idea behind the changes into your own code.
| Especially if you are cleaning up pieces that are not used anymore [and just
| happen to share a few "}" and "break;" with new code that confuse diff...]
|
| Maybe there is an option to tell diff not to try very hard to find similar
| lines in order to increase the chance of getting fewer << === >> blocks
| (even if they are longer)?
man diff:
-b ignore changes in amount of white space.
-B ignore changes that just insert or delete blank lines.
-d Change the algorithm to perhaps find a smaller set of changes. This
makes diff slower.
--
Lgb
