diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2010-07-06 19:34:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 04:28:55 (GMT) |
| commit | 420432d4342e214c15f063a630a883072d4e5779 (patch) | |
| tree | 0f656eec1ac51918387de97e3e7c21d57f6820c6 /git-merge-octopus.sh | |
| parent | d66ee046fc8597af62daeb890b15d5799c786b0d (diff) | |
| download | git-420432d4342e214c15f063a630a883072d4e5779.zip git-420432d4342e214c15f063a630a883072d4e5779.tar.gz git-420432d4342e214c15f063a630a883072d4e5779.tar.bz2 | |
add missing && to submodule-merge testcase
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions