diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 14:00:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 14:00:37 -0700 |
| commit | caf217a3b8ed4b88f58e2a151c07221d37db7abe (patch) | |
| tree | 79b3ae9735eaef05809f2b9310683095f9280d0d /mergetools/vimdiff2 | |
| parent | Merge branch 'jl/submodule-deinit' (diff) | |
| parent | tests: make sure rename pretty print works (diff) | |
| download | tgif-caf217a3b8ed4b88f58e2a151c07221d37db7abe.tar.xz | |
Merge branch 'ap/maint-diff-rename-avoid-overlap'
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
Diffstat (limited to 'mergetools/vimdiff2')
0 files changed, 0 insertions, 0 deletions