summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-01-27 22:03:48 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-27 18:00:09 -0800
commit6de07229ac1dd269e12f941f701432b61dc43ad3 (patch)
tree3983a7990a371e830f4f76787fc93655bacafc22 /builtin/merge-file.c
parentGit 2.35 (diff)
downloadtgif-6de07229ac1dd269e12f941f701432b61dc43ad3.tar.xz
git-sh-setup: remove remnant bits referring to `git-legacy-stash`
In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed `git-legacy-stash.sh`. But `git-sh-setup.sh` somehow still thinks about it. Let's just not. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions