Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:46 +0000 (1 09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:19:47 +0000 (1 09:19 -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