diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
| commit | 7bf8e474d15414eda8520ba5258511d845ca6061 (patch) | |
| tree | 417d6cfc8946fce8e2f87fdf3ec964036abd495c /t/t3411-rebase-preserve-around-merges.sh | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-7bf8e474d15414eda8520ba5258511d845ca6061.tar.gz | |
Merge tag 'v1.8.4' into baserock/morph
Git 1.8.4
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
| -rwxr-xr-x | t/t3411-rebase-preserve-around-merges.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index ace8e54e9b..dc81bf27eb 100755 --- a/t/t3411-rebase-preserve-around-merges.sh +++ b/t/t3411-rebase-preserve-around-merges.sh @@ -56,6 +56,7 @@ test_expect_success 'squash F1 into D1' ' # And rebase G1..M1 onto E2 test_expect_success 'rebase two levels of merge' ' + git checkout A1 && test_commit G1 && test_commit H1 && test_commit I1 && |