hello 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 ?
--
Aldo Tendron
_______________________________________________
Info-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/info-cvs
