summaryrefslogtreecommitdiff
path: root/mergetools/smerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-08-16 12:15:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-16 12:15:44 -0700
commit225bc32a989d7a22fa6addafd4ce7dcd04675dbf (patch)
tree256afabcb270d602a0051923c999a0ac6f55e19d /mergetools/smerge
parentMerge branch 'rs/oidtree-alignment-fix' (diff)
downloadtgif-225bc32a989d7a22fa6addafd4ce7dcd04675dbf.tar.xz
Git 2.33
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/smerge')
0 files changed, 0 insertions, 0 deletions