From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Mar 2009 20:47:01 +0000 (-0700)
Subject: Merge branch 'tr/gcov'
X-Git-Tag: v1.6.3-rc0~176
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e785dadc90df20e1038c053dc168a6458b1e672b;p=git.git

Merge branch 'tr/gcov'

* tr/gcov:
  Test git-patch-id
  Test rev-list --parents/--children
  Test log --decorate
  Test fsck a bit harder
  Test log --graph
  Test diff --dirstat functionality
  Test that diff can read from stdin
  Support coverage testing with GCC/gcov
---

e785dadc90df20e1038c053dc168a6458b1e672b
diff --cc t/t4013-diff-various.sh
index 9c709022e,0f359ca28..9cd5a6e68
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@@ -266,8 -266,8 +270,9 @@@ diff --patch-with-raw -r initial..sid
  diff --name-status dir2 dir
  diff --no-index --name-status dir2 dir
  diff --no-index --name-status -- dir2 dir
 +diff --no-index dir dir3
  diff master master^ side
+ diff --dirstat master~1 master~2
  EOF
  
  test_done