Curtis L. Olson writes: > diff -w ignores white space, but that doesn't necessarily help if you > are using emacs ediff to compare the files and merge the changes.
It could, perhaps, if you do something like this: diff -w main.cxx /tmp/new-main.cxx > main.patch patch main.cxx < /tmp/main.patch xemacs main.cxx then, in xemacs, M-x ediff-revision All the best, David -- David Megginson [EMAIL PROTECTED] _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel