Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 07:11:17 +0000 (03:11 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 07:11:17 +0000 (03:11 -0400)
* maint:
  Yet more 1.5.3.5 fixes mentioned in release notes
  cvsserver: Use exit 1 instead of die when req_Root fails.
  git-blame shouldn't crash if run in an unmerged tree
  git-config: print error message if the config file cannot be read
  fixing output of non-fast-forward output of post-receive-email

1  2 
contrib/hooks/post-receive-email
read-cache.c

Simple merge
diff --cc read-cache.c
Simple merge