diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:35:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 16:35:30 -0700 |
| commit | ae3858e7e9146208f1608445975e2761c9b0482e (patch) | |
| tree | 9e1eb12a335477fdadc0157e67e6c40401ba01db /diff.c | |
| parent | 17ebe977d72290dcdc848b78ae2e65b59d4e1b4c (diff) | |
| download | git-ae3858e7e9146208f1608445975e2761c9b0482e.tar.gz | |
Make sure we error out if we can't remove a file on automatic merges.
Pointed out by Junio.
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions