On Mon, Jul 29, 2002, Peter Smej wrote:
> [...]
> $ cvs diff -u -r1.1059 -r1.1060 news.txt
> --- openpkg-web/news.txt 29 Jul 2002 09:46:50 -0000 1.1059
> +++ openpkg-web/news.txt 29 Jul 2002 09:49:24 -0000 1.1060
> @@ -1,4 +1,9 @@
> +29-Jul-2002: Upgraded package: P<automake-1.6.3-20020729>
> +<<<<<<< news.txt
> +29-Jul-2002: Upgraded package: P<cdk-4.9.10.20020727-20020729>
> +=======
> 29-Jul-2002: Upgraded package: P<portsentry-1.1-20020729>
> +>>>>>>> 1.1059
> 29-Jul-2002: Upgraded package: P<vim-6.1.142-20020729>
> 28-Jul-2002: Upgraded package: P<shellutils-2.0.13-20020728>
> 28-Jul-2002: Upgraded package: P<perl-term-20020728-20020728>
Be careful a little bit more here. You have not solved a conflict
here and instead committed the unmerged state.
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
______________________________________________________________________
The OpenPKG Project www.openpkg.org
Developer Communication List [EMAIL PROTECTED]
