summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2021-05-01 11:42:08 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-03 14:41:08 +0900
commit43a2220f19eca9667dfac59a5e8a4deda2c3eb3d (patch)
treee6da85af3ac35c4d18d2a8d26ee0194ac15c8c13 /builtin/merge-ours.c
parentfsck_tree(): wrap some long lines (diff)
downloadtgif-43a2220f19eca9667dfac59a5e8a4deda2c3eb3d.tar.xz
t7415: rename to expand scope
This script has already expanded beyond its original intent of ".. in submodule names" to include other malicious submodule bits. Let's update the name and description to reflect that, as well as the fact that we'll soon be adding similar tests for other dotfiles (.gitattributes, etc). We'll also renumber it to move it out of the group of submodule-specific tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions