summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 10:13:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-17 10:13:34 -0800
commit82c17b7a9ae1c78ce4891ad272f78fd2cd181ded (patch)
tree80fc197f62f73001fc213011474369dbe0a39708 /Documentation/RelNotes
parentMerge branch 'ah/stripspace-optstring' (diff)
parentmergetool: reorder vim/gvim buffers in three-way diffs (diff)
downloadtgif-82c17b7a9ae1c78ce4891ad272f78fd2cd181ded.tar.xz
Merge branch 'dw/mergetool-vim-window-shuffle'
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 'Documentation/RelNotes')
0 files changed, 0 insertions, 0 deletions