Re: mercurial problem

On Oct 5, 2011, at 7:29 AM, Luc Moreau wrote:

> 
> sorry for the spam.

x2.


Can anyone recommend how to handle:

bash-3.2$ hg merge tip
abort: outstanding uncommitted merges

hg status hasn't been useful...

Thanks,
Tim


> 
> There  4 heads in the default branch, seemed all to be
> created by Satya editing ontology-related files.
> 
> Cheers,
> Luc

Received on Wednesday, 5 October 2011 14:33:11 UTC