[cvsnt] But... (was: No conflict when merging, where one is expected)

[Glen Starrett]

> 1) Repetitive merges from a branch requires special handling, because
you only 
> want to apply changes that were not already made, see
> 
> http://cvsbook.red-bean.com/cvsbook.html#Multiple_Merges

Note that the above does not apply to cvsnt--see the discussions on
"mergepoint".  Mergepoint remembers where a file was last merged from
another and uses that to correctly determine the common ancestor.

Regards,

Glen Starrett