From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:56 +0000 (-0700)
Subject: Merge branch 'jh/diff-index-line-abbrev'
X-Git-Tag: v1.7.2-rc0~51
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/18fd805583130862632e40e98aecc7edcd16d878?hp=18fd805583130862632e40e98aecc7edcd16d878

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
---