projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17ebe97) | patch
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)
commitae3858e7e9146208f1608445975e2761c9b0482e
tree9e1eb12a335477fdadc0157e67e6c40401ba01dbtree | snapshot
parent17ebe977d72290dcdc848b78ae2e65b59d4e1b4ccommit | diff
Make sure we error out if we can't remove a file on automatic merges.

Pointed out by Junio.
git-merge-one-file-script diff | blob | history
The core git plumbing