[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs update

From: Sergei Organov
Subject: Re: cvs update
Date: Fri, 03 Mar 2006 22:35:17 +0300
User-agent: Gnus/5.110004 (No Gnus v0.4) XEmacs/21.4.18 (linux)

Martin Jørgensen <address@hidden> writes:
> I was also interested in finding out how to resolve the conflict
> supposing that the file actually was important.... Something about
> this diff-utility, right?

To resolve conflict(s) one usually uses his favorite text editor.

Did you consider to read the fine manual, e.g., at
and <>
in particular?

-- Sergei.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]