From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 15:37:39 +0000 (-0700)
Subject: Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
X-Git-Tag: v1.8.1.6~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f780ca9be58d748c79e11b8dccad9474f4d1a19?ds=inline;hp=--cc

Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1

* ap/maint-diff-rename-avoid-overlap:
tests: make sure rename pretty print works
diff: prevent pprint_rename from underrunning input
diff: Fix rename pretty-print when suffix and prefix overlap
---

8f780ca9be58d748c79e11b8dccad9474f4d1a19