summaryrefslogtreecommitdiff
path: root/gitk-git/gitk
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 15:47:38 -0800
commitb3db182886fccb2220b8aa0a2389cf1c2e12aadb (patch)
treec0e1ee101f59b30851f11fac058e2587f6482f69 /gitk-git/gitk
parentMerge branch 'rs/pcre-invalid-utf8-fix-fix' (diff)
parentmerge-ort: make informational messages from recursive merges clearer (diff)
downloadtgif-b3db182886fccb2220b8aa0a2389cf1c2e12aadb.tar.xz
Merge branch 'en/ort-inner-merge-conflict-report'
Messages "ort" merge backend prepares while dealing with conflicted paths were unnecessarily confusing since it did not differentiate inner merges and outer merges. * en/ort-inner-merge-conflict-report: merge-ort: make informational messages from recursive merges clearer
Diffstat (limited to 'gitk-git/gitk')
0 files changed, 0 insertions, 0 deletions