mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
Code Activity

Merge branch 'en/t3031-title-fix'

Browse source 
Test fix.

* en/t3031-title-fix:
  t3031: update test description to mention desired behavior
This commit is contained in:
Junio C Hamano 2018-08-17 13:09:58 -07:00
commit b576cf70b2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t3031-merge-criscross.sh
View file

@ -88,7 +88,7 @@ test_expect_success 'setup repo with criss-cross history' '
git branch G git branch G
' '
test_expect_success 'recursive merge between F and G, causes segfault' ' test_expect_success 'recursive merge between F and G does not cause segfault' '
git merge F git merge F
' '