kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'en/t3031-title-fix' 

Test fix.

* en/t3031-title-fix:
  t3031: update test description to mention desired behavior
maint
Junio C Hamano 2018-08-17 13:09:58 -07:00
parent 791ad49483 69885ab015
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
'

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
'