author | Santi Béjar <sbejar@gmail.com> | |
Fri, 16 Mar 2007 10:46:09 +0000 (11:46 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 16 Mar 2007 11:34:17 +0000 (04:34 -0700) | ||
commit | 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b | |
tree | 9d1acbc2838690495a2e002f902cf5e88b475176 | tree | snapshot |
parent | 3d4e1932f24346d26f15e98dd6a74798035e7870 | commit | diff |
git-merge: finish when git-read-tree fails
The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain.
Noticed by Dmitry Torokhov.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain.
Noticed by Dmitry Torokhov.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh | diff | blob | history |