summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-11-23 14:48:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-23 14:48:15 -0800
commitd62a7656fed27af65b1eb5c49501343696ad728a (patch)
treee743e24ccc081d449c755ec9720be0238316a047 /mergetools/winmerge
parentMerge branch 'ds/add-rm-with-sparse-index' into maint (diff)
parentRevert "editor: save and reset terminal after calling EDITOR" (diff)
downloadtgif-d62a7656fed27af65b1eb5c49501343696ad728a.tar.xz
Merge branch 'jc/save-restore-terminal-revert' into maint
Regression fix for 2.34 * jc/save-restore-terminal-revert: Revert "editor: save and reset terminal after calling EDITOR"
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions