Ralf Hemmecke wrote:
To make it what I did, I included my commands in /trunk/axiom/ChangLog
(date 2006-09-13 and 2006-09-14). I must have thought that these
commands might be useful in the future. ;-)
That should help.
I first tried fully automatic way and in the meantime I read svn textbook.
At the time when I realized that automtic merge is not going to work, I
found a way to set parametrs, so I just used it. I used your commands
on '*.daase' files, but I think that may files on your list are in
fact text files. I corrected all files which were corrupted except for
'libaxiom.al'.