diff options
| author | Santi Béjar <sbejar@gmail.com> | 2007-03-16 11:46:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-16 04:34:17 -0700 |
| commit | 2be08a84bae10a0c7ecf2ef921896ce838a6ed0b (patch) | |
| tree | 9d1acbc2838690495a2e002f902cf5e88b475176 /merge-recursive.c | |
| parent | 3d4e1932f24346d26f15e98dd6a74798035e7870 (diff) | |
| download | git-2be08a84bae10a0c7ecf2ef921896ce838a6ed0b.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions