Make sure we error out if we can't remove a file on automatic merges.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:35:30 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:35:30 +0000 (16:35 -0700)
Pointed out by Junio.

No differences found