[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Wed, 22 Dec 2004 08:10:45 +0100
On Windows, 'update' doesn't remove "Result of Merge" from Entries file.
If there is no markers in the merged file ('<<<<, ===, >>>'), is it save
to remove by hand the "Result of Merge" text from Entries file ? Or is
there a case that cvs st should return "File had conflicts on merge"
even if there is no markers in the merged file ?
- issue 108,
Aldo TENDRON <=