diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 02:37:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 02:37:25 (GMT) |
| commit | e5b905c4481a3364070094b8ce0c2bf7fa5d481e (patch) | |
| tree | 46b5c93213487c8d06759333b0669d0f8e0fb04d /merge-cache.c | |
| parent | ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec (diff) | |
| download | git-e5b905c4481a3364070094b8ce0c2bf7fa5d481e.zip git-e5b905c4481a3364070094b8ce0c2bf7fa5d481e.tar.gz git-e5b905c4481a3364070094b8ce0c2bf7fa5d481e.tar.bz2 | |
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.
Diffstat (limited to 'merge-cache.c')
0 files changed, 0 insertions, 0 deletions