Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Oct 2008 15:26:44 +0000 (08:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Oct 2008 15:26:44 +0000 (08:26 -0700)
* maint:
  Hopefully the final draft release notes update before 1.6.0.3
  diff(1): clarify what "T"ypechange status means
  contrib: update packinfo.pl to not use dashed commands
  force_object_loose: Fix memory leak
  tests: shell negation portability fix

1  2 
Documentation/diff-options.txt
sha1_file.c

Simple merge
diff --cc sha1_file.c
Simple merge