summaryrefslogtreecommitdiff
path: root/trace.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-30 21:11:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-03 14:43:43 -0700
commita79968bed184029139ddcd0a4e8171a2c84852ee (patch)
tree428c0bbde1116a1c7bfcb5816121a7ce783fc861 /trace.c
parentt6036: add a failed conflict detection case with submodule modify/modify (diff)
downloadtgif-a79968bed184029139ddcd0a4e8171a2c84852ee.tar.xz
t6036: add a failed conflict detection case with submodule add/add
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace.c')
0 files changed, 0 insertions, 0 deletions