multiple heads

[Neal Becker]

Mathieu Clabaut wrote:

> On Thu, Mar 19, 2009 at 16:47, Mads Kiilerich <mads at kiilerich.com> wrote:
> 
>> On 03/19/2009 04:23 PM, Neal Becker wrote:
>> >   hg merge 555
>> > abort: outstanding uncommitted changes
>> >
>> >   hg diff -g
>> > [silence]
>> >
>> > hg status -m
>> > [nothing]
>> >
>> > Now I'm really confused!  What are these uncommitted changes then?
>>
> do you have inotify extension enabled ?
> If so can you give a try after deactivating it.
> 
> -Mathieu
No inotify.