![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 02:37:25 +0000 (19:37 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 02:37:25 +0000 (19:37 -0700) | ||
| commit | e5b905c4481a3364070094b8ce0c2bf7fa5d481e | |
| tree | 46b5c93213487c8d06759333b0669d0f8e0fb04d | tree | snapshot |
| parent | ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec | commit | diff |
git-resolve-script: stop when the automated merge fails
No point in doing a tree write that will just throw
confusing messages on the screen.
No point in doing a tree write that will just throw
confusing messages on the screen.
| git-resolve-script | diff | blob | history |