[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
conflict and .#file
From: |
jose |
Subject: |
conflict and .#file |
Date: |
Tue, 03 Sep 2002 16:51:23 +0200 |
User-agent: |
Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.1) Gecko/20020826 |
I think I found a bug in cvs.
CVS creates a .#file when it finds a conflict in the "file", and then
it puts
<<<<<<< nome_file
some text
=======
Some times CVS thinks it finds a conflict and creates the .#file but
don't put any
<<<<<<<<<nome_file
text
=========
into the "file"
jose
- conflict and .#file,
jose <=