Merge branch 'jh/diff-index-line-abbrev'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)
* jh/diff-index-line-abbrev:
diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s

Conflicts:
diff.c

No differences found