summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-01-27 22:03:51 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-27 18:00:45 -0800
commite9b272e4c1cb9742452ad44d42cedd407b6b5de2 (patch)
tree5ed5f9a4d62ac4daa8ab7439171e68c539dad18c /t/t6427-diff3-conflict-markers.sh
parentstash: remove documentation for `stash.useBuiltin` (diff)
downloadtgif-e9b272e4c1cb9742452ad44d42cedd407b6b5de2.tar.xz
stash: stop warning about the obsolete `stash.useBuiltin` config setting
In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed support for `stash.useBuiltin`, but left a warning in its place. After almost two years, and several major versions, it is time to remove even that warning. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions