git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0311e37 b174eb4)
Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
authorJunio C Hamano <redacted>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
committerJunio C Hamano <redacted>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
commit8f780ca9be58d748c79e11b8dccad9474f4d1a19
tree5379d1d08fc1d5adc83bd50972ddf1b20b31c167tree | snapshot
parent0311e373b5f26f89ec65f0fbcebeba4fd68f4ad0commit | diff
parentb174eb42d08eeb32ae7341ff46b05c20d38abc2bcommit | diff
Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1

* 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 diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT