summaryrefslogtreecommitdiff
path: root/tree.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-06-30 21:11:17 -0700
committerJunio C Hamano <gitster@pobox.com>2018-07-03 14:43:42 -0700
commitc6d3dd5daf60e7b33d5843bb5dec44fcf852d239 (patch)
treecb4a31b37245b97c318f5046d6eeb913f1c6ccce /tree.h
parente3331758f12da22f4103eec7efe1b5304a9be5e9 (diff)
downloadgit-c6d3dd5daf60e7b33d5843bb5dec44fcf852d239.tar.gz
t6036: add a failed conflict detection case with symlink modify/modify
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree.h')
0 files changed, 0 insertions, 0 deletions