[ Thread Index |
Date Index
| More lists.tuxfamily.org/slitaz Archives
]
- To: slitaz@xxxxxxxxxxxxxxxxxxx
- Subject: Re: hg error
- From: Allan Pinto <allan316@xxxxxxxxx>
- Date: Wed, 3 Jun 2009 05:02:31 +0000
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=pN9SG9l+/8O6MxnLkDX1R7/XgK+vjO19oHs+EdUVszo=; b=uSmCZ/xX22nj3ITW7H3A5hxfuHkuanZmE+GHP0bmhgOUEo2nsZ4CBl3YRbmQzDkAtT mMw91kBHs2AWTEx3fy41+vJr8Qaw06RwpZ9HKNshdwcIzr+XvguA21YHp/esB1UubvME ui5g62GCbAG8GzJOXFqQFDSVIcLoB3oGI9xNc=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=UbXm9vtGw8EH4uLMFIibnVQEKm4426AvrctzRKU6bi7wNtVZnMjD7oMGlXBDT1QuN1 1wtOgdIPLMEwSm1j6w3qzX8Wbv9r/XnbCNcx55kZwJMs8OUfkhBm2QZugLyqBgugeQpA aA+z+2PwrzZ4+ldxFLdGEtTGVY+P9oQefarZ4=
scratch that, its solved
On Wed, Jun 3, 2009 at 3:55 AM, Allan Pinto <allan316@xxxxxxxxx> wrote:
> Was trying to commit a change to espeak,
> did hg pull,
> hg update,
> hg commit espeak ( after doin g the change in the receipt)
> hg push gives me a hg merge error saying two heads have been formed.
>
> now i cant commit espeak again
>
>
> --
> Thanx and regd's.
>
> Allan.
> http://www.in2dwok.com
>
--
Thanx and regd's.
Allan.
http://www.in2dwok.com
---
SliTaz GNU/Linux Mailing list - http://www.slitaz.org/