Re: Problems with ca.po

[Akim Demaille]

> What branch of a2ps is this?

OK, silly question, how do I tell which branch I'm working
on???

% cvs status
| % head -20 ca.po
| # Missatges en català per a a2ps.
| # Copyright (c) 1997, 98 Miquel Àngel Varó i Giner
| # Miquel Àngel Varó i Giner <address@hidden>, 1998.
| #
| msgid ""
| msgstr ""
| "Project-Id-Version: a2ps 4.7.21\n"
| <<<<<<< ca.po
| "POT-Creation-Date: 2002-09-04 12:02-0400\n"
| =======
| "POT-Creation-Date: 2002-09-19 19:07+0200\n"
| >>>>>>> 1.9
| "PO-Revision-Date: 1999-01-11 15:57+01:00\n"
| "Last-Translator: Miquel Àngel Varó i Giner <address@hidden>\n"
| "Language-Team: Catalan <address@hidden>\n"
| "MIME-Version: 1.0\n"
| "Content-Type: text/plain; charset=ISO-8859-1\n"
| "Content-Transfer-Encoding: 8-bit\n"
| 
| #: src/buffer.c:62

You have conflicts!  run `cvs up -C' when you update *and don't want
to keep your modifications*.