Andrew's git / gitweb.git / commit
?
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)
commitae3858e...e9146208f1608445975e2761c9b0482e
tree9e1eb12...335477fdadc0157e67e6c40401ba01dbcopy hash to clipboard (tree)
parent17ebe97...d72290dcdc848b78ae2e65b59d4e1b4ccopy hash to clipboard (diff)
git-merge-one-file-script diff | blob | history