Strange merge conflicts in d-i/tools/cdrom-detect/debian/po/fi.po

2004-01-14 Thread Tapio Lehtonen
How come d-i/tools/cdrom-detect/debian/po/fi.po is so messed up? I can't make heads or tails of the file due to the numerous strange merge conflicts. It looks like two guite different files have been merged together. KBabel does not want to touch the file, the merge conflict markings confuse it. I

Re: Strange merge conflicts in d-i/tools/cdrom-detect/debian/po/fi.po

2004-01-14 Thread Denis Barbier
On Wed, Jan 14, 2004 at 07:46:02PM +0200, Tapio Lehtonen wrote: How come d-i/tools/cdrom-detect/debian/po/fi.po is so messed up? It is not. There are conflicts because you have a locally modified version and someone else did also change this file. See 'Conflicts example' section in cvs.info.