Merge branch 'jc/log-stdin'

diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 9bee516358bd98d1b5c701f6aa0c4f3e4d95bd45..f57daf401ac7c36c1d9f2380200e0efad2400f70 100755 (executable)
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -15,7 +15,11 @@ test_expect_success 'load svn dump' "
        git svn fetch --all
        "
 
-test_expect_success 'svn merges were represented coming in' "
+test_expect_success 'represent svn merges without intervening commits' "
+       [ `git cat-file commit HEAD^1 | grep parent | wc -l` -eq 2 ]
+       "
+
+test_expect_success 'represent svn merges with intervening commits' "
        [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
        "