summaryrefslogtreecommitdiff
path: root/compat/nedmalloc/License.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-22 13:10:20 -0800
commit2263a05907a1dd8d402790b578573238ab2abd9a (patch)
tree7ea09a148a9654ce0e1869a44f6670913b640291 /compat/nedmalloc/License.txt
parentMerge branch 'ah/stripspace-optstring' into maint (diff)
parentmergetool: reorder vim/gvim buffers in three-way diffs (diff)
downloadtgif-2263a05907a1dd8d402790b578573238ab2abd9a.tar.xz
Merge branch 'dw/mergetool-vim-window-shuffle' into maint
The vimdiff backend for "git mergetool" has been tweaked to arrange and number buffers in the order that would match the expectation of majority of people who read left to right, then top down and assign buffers 1 2 3 4 "mentally" to local base remote merge windows based on that order. * dw/mergetool-vim-window-shuffle: mergetool: reorder vim/gvim buffers in three-way diffs
Diffstat (limited to 'compat/nedmalloc/License.txt')
0 files changed, 0 insertions, 0 deletions