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)
commite5b905c...481a3364070094b8ce0c2bf7fa5d481e
tree46b5c93...13487c8d06759333b0669d0f8e0fb04dcopy hash to clipboard (tree)
parented37b5b...b94398f3ab8312dfdf23cfd25549e3eccopy hash to clipboard (diff)
git-resolve-script