summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-29 12:38:19 -0700
commit3e06e74e4cc221d0b602622a5a8d472cfa3efa2d (patch)
tree1d22e6e40d9c6d8daddcf4c1a9e19a46255bfde4 /mergetools/kdiff3
parentMerge branch 'ms/submodule-foreach-fix' into maint (diff)
parentprogress: use term_clear_line() (diff)
downloadtgif-3e06e74e4cc221d0b602622a5a8d472cfa3efa2d.tar.xz
Merge branch 'sg/rebase-progress' into maint
Use "Erase in Line" CSI sequence that is already used in the editor support to clear cruft in the progress output. * sg/rebase-progress: progress: use term_clear_line() rebase: fix garbled progress display with '-x' pager: add a helper function to clear the last line in the terminal t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused t3404: modernize here doc style
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions