diff --git a/tests/test-pull.t b/tests/test-pull.t index 19d34b8f69dad62e816a3ad028d6b4ff360e409c_dGVzdHMvdGVzdC1wdWxsLnQ=..338e4e5ba6dcf2f9d90ac895dac3a8ff1432d495_dGVzdHMvdGVzdC1wdWxsLnQ= 100644 --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -124,10 +124,10 @@ date: Mon Jan 01 00:00:10 2007 +0000 summary: add alpha -add a merge to the git repo +add a merge to the git repo, and delete the branch $ cd gitrepo $ git merge -m "Merge branch 'beta'" beta | sed 's/| */| /' Merge made by the 'recursive' strategy. beta | 1 + 1 file changed, 1 insertion(+) create mode 100644 beta @@ -128,9 +128,11 @@ $ cd gitrepo $ git merge -m "Merge branch 'beta'" beta | sed 's/| */| /' Merge made by the 'recursive' strategy. beta | 1 + 1 file changed, 1 insertion(+) create mode 100644 beta + $ git branch -d beta + Deleted branch beta (was 9497a4e). $ cd .. pull the merge