On Thu, Feb 07, 2002 at 08:20:07AM +0100, Andre Poenitz wrote:
> On Wed, Feb 06, 2002 at 03:07:03PM -0700, Mario Parra wrote:
> > Cut and pasting would require the same amount of effort.
>
> Have a look at merge(1):
>
> DESCRIPTION
> merge incorporates all changes that lead from file2 to
> file3 into file1. The result ordinarily goes into file1.
> merge is useful for combining separate changes to an orig�
> inal. Suppose file2 is the original, and both file1 and
> file3 are modifications of file2. Then merge combines
> both changes.
>
> If 'file1' is your .lyx, 'file2' your exported .tex and 'file3' your
> .tex with the advisor's changes it might work in some circumstances.
I don't think it will work since merge works on lines.
A better change of getting something usefull is to have
file1 = the .lyx file
file2 = the .lyx file you get by running reLyX on the exported .tex file
file3 = the .lyx file you get by running reLyX on the .tex with the
advisor's changes
But there is still a chance that this will not work, so use with caution.
