No subject

Fri Jan 25 03:23:22 GMT 2008

1) when the file can be merged
2) when the file cannot be merged (usually a binary file)
3) when there was a conflict merge in a previous merge or the conflict 
indicators are still in the file

More information about the cvsnt mailing list