From: Meelis Roos <mroos@linux.ee>
Date: Thu, 27 Jul 2006 19:37:35 GMT
Subject: git bisect: merge problem with deleted file
Message-ID: <Pine.SOC.4.61.0607272235100.19826@math.ut.ee>

mroos@nartsiss:~/compile/linux-2.6$ git bisect start
mroos@nartsiss:~/compile/linux-2.6$ git bisect good 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3
mroos@nartsiss:~/compile/linux-2.6$ git bisect bad 9676489866a75fdd56b0d3e40ec7884298bb1338
Bisecting: 43 revisions left to test after this
fatal: Untracked working tree file 'Documentation/filesystems/devfs/ChangeLog' would be overwritten by merge.

Got this while trying to bisec Linus' linux-2.6 tree. I have 1 
uncommited change in the tree so this might influence the need for 
merging.

-- 
Meelis Roos (mroos@linux.ee)