From: Elijah Newren <newren@gmail.com>
Date: Sun, 1 Jul 2018 04:11:17 +0000 (-0700)
Subject: t6036: add a failed conflict detection case with symlink modify/modify
X-Git-Tag: v2.19.0-rc0~96^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c6d3dd5daf60e7b33d5843bb5dec44fcf852d239?ds=inline;hp=c6d3dd5daf60e7b33d5843bb5dec44fcf852d239

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>
---