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

diff --cc Makefile
Simple merge

diff --cc t/t4013-diff-various.sh
index 9c709022efb1b553ef53b3100d39e852117cbeda,0f359ca28e4baa085afec5dbedd0bedf86e7bfbe..9cd5a6e68563aede0e69270421b56d1904c34165
--- 1/t/t4013-diff-various.sh
--- 2/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

diff --cc t/t4202-log.sh
Simple merge