Merge branch 'sb/daemon'

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index f45ab0a2e8ad4b02cd0bdd9a2cb57d74d86382f1..7d86cdff64522f588a3d3e781cf2b272087cfd88 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -17,6 +17,8 @@ test_expect_success setup '
        for i in 2 3 4 5 6
        do
                echo $i >>file-1 &&
+               echo $i >otherfile-$i &&
+               git add otherfile-$i &&
                test_tick &&
                git commit -a -m $i || break
        done &&