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