Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
* 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

1  2 
diff.c
diff --cc diff.c
Simple merge