Fatal error from git bisect

Hello,
 
I'm trying to use 'git bisect' and am running into the following error:

[mason@hawaii linux.git]$ git bisect reset
[mason@hawaii linux.git]$ git bisect start
[mason@hawaii linux.git]$ git bisect good
d166b5a220813a08a79312fc384d11e1c57e9072
[mason@hawaii linux.git]$ git bisect bad
a7900c9bdb64c11688719bef9f6373fbc4c276ab
Bisecting: 116 revisions left to test after this
fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot
merge.

(this is the linux-mips.org kernel repository, a7900c9b is a child of d166b5a2).

What does this mean? How do I get around it? As you can probably guess, I'm a beginner to git bisect.

Thanks in advance. Mark

On Thu, 9 Feb 2006, Mark E Mason wrote:

This seems to mean that you have a dirty block/elevator.c file. Have you perhaps edited it?

		Linus