]> git.ipfire.org Git - thirdparty/git.git/commit - git-resolve.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed37b5b) | patch
git-resolve-script: stop when the automated merge fails
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 02:37:25 +0000 (19:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 02:37:25 +0000 (19:37 -0700)
commite5b905c4481a3364070094b8ce0c2bf7fa5d481e
tree46b5c93213487c8d06759333b0669d0f8e0fb04dtree | snapshot
parented37b5b2b94398f3ab8312dfdf23cfd25549e3eccommit | 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.
git-resolve-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.