Merge branch 'eb/quilt' into next

diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh
index b141f89de2be4a2fa6ff1f3b0748daece23f9d8a..e83bbee07402d864a7241d4edbf5d393dcccdd4a 100755 (executable)
--- a/t/t3500-cherry.sh
+++ b/t/t3500-cherry.sh
@@ -30,6 +30,7 @@ test_expect_success \
      git-commit -m "Add C." &&
 
      git-checkout -f master &&
+     rm -f B C &&
 
      echo Third >> A &&
      git-update-index A &&