[cvsnt] Diff and Merge Error Using 1.11.1.3

Tony Hoyle tmh at nodomain.org
Sun Jan 5 22:12:15 GMT 2003


Jefferson, Anthony wrote:

> retrieving revision 1.6
> retrieving revision 1.7
> Merging differences between 1.6 and 1.7 into build.xml
> build.xml already contains the differences between 1.6 and 1.7
> 
That's your answer.   Your local version 1.6 already contains the changes
made to go from 1.6->1.7, so there's nothing to do.

Tony




More information about the cvsnt mailing list