Code

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)
commit18fd805583130862632e40e98aecc7edcd16d878
treea72e49115b5c03f9291545f44af78394e9765198
parentecdb3ec9846d06750a0d4b79884a763aa91daa40
parent3e5a188f1d5b48dcc0bc73ad520925cdb846dfaf
Merge branch 'jh/diff-index-line-abbrev'

* jh/diff-index-line-abbrev:
  diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s

Conflicts:
diff.c
diff.c