From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2013 16:19:46 +0000 (-0700)
Subject: Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
X-Git-Tag: v1.8.2.1~19
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=b76a9e164854a7a87a2f21859f05b132ee5b83d9

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

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

b76a9e164854a7a87a2f21859f05b132ee5b83d9