From: Junio C Hamano <junkio@cox.net>
Date: Wed, 4 Apr 2007 04:52:14 +0000 (-0700)
Subject: Merge 1.5.0.7 in
X-Git-Tag: v1.5.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=045f5759c97746589a067461e50fad16f60711ac;p=thirdparty%2Fgit.git

Merge 1.5.0.7 in

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

045f5759c97746589a067461e50fad16f60711ac
diff --cc t/t4200-rerere.sh
index e081b32aff,69b8d26cd1..8b611bbea2
--- a/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