![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 8 Jun 2005 23:35:30 +0000 (16:35 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 8 Jun 2005 23:35:30 +0000 (16:35 -0700) | ||
| commit | ae3858e7e9146208f1608445975e2761c9b0482e | |
| tree | 9e1eb12a335477fdadc0157e67e6c40401ba01db | tree | snapshot |
| parent | 17ebe977d72290dcdc848b78ae2e65b59d4e1b4c | commit | diff |
Make sure we error out if we can't remove a file on automatic merges.
Pointed out by Junio.
Pointed out by Junio.
| git-merge-one-file-script | diff | blob | history |