Merge 1.5.0.7 in

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc builtin-rerere.c
Simple merge

diff --cc t/t4200-rerere.sh
index e081b32aff393c4ea6d2e12e3d69d2217d6ef378,69b8d26cd13b2fad7b84b9b37e240188aaf085b4..8b611bbea210551d86016b53718ba1af313f1353
--- 1/t/t4200-rerere.sh
--- 2/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@@ -66,11 -74,16 +74,16 @@@ cat > expect << EO
   To sleep: perchance to dream: ay, there's the rub;
   For in that sleep of death what dreams may come
   When we have shuffled off this mortal coil,
+  Must give us pause: there's the respect
+ -<<<<<<<
+ -That makes calamity of so long life.
+ -=======
+  That makes calamity of so long life;
+ ->>>>>>>
  EOF
- 
  git rerere diff > out
  
 -test_expect_success 'rerere diff' 'diff -u expect out'
 +test_expect_success 'rerere diff' 'git diff expect out'
  
  cat > expect << EOF
  a1