Merge branch 'ap/maint-diff-rename-avoid-overlap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:00:37 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:00:37 +0000 (14:00 -0700)
The logic used by "git diff -M --stat" to shorten the names of
files before and after a rename did not work correctly when the
common prefix and suffix between the two filenames overlapped.

* 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