diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-07 17:24:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-08 00:50:01 (GMT) |
| commit | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df (patch) | |
| tree | 1245fa311746c7d0c0ec78a7d773a57edb5460a5 /t/t7602-merge-octopus-many.sh | |
| parent | 1c6669351a47c834cceb75d6044a1aae259fc69f (diff) | |
| download | git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.zip git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.gz git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.bz2 | |
Build in merge
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index f3a4bb2..fcb8285 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -23,7 +23,7 @@ test_expect_success 'setup' ' done ' -test_expect_failure 'merge c1 with c2, c3, c4, ... c29' ' +test_expect_success 'merge c1 with c2, c3, c4, ... c29' ' git reset --hard c1 && i=2 && refs="" && |