diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-06-30 21:11:17 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-03 14:43:42 -0700 |
| commit | c6d3dd5daf60e7b33d5843bb5dec44fcf852d239 (patch) | |
| tree | cb4a31b37245b97c318f5046d6eeb913f1c6ccce /git-parse-remote.sh | |
| parent | Second batch for 2.19 cycle (diff) | |
| download | tgif-c6d3dd5daf60e7b33d5843bb5dec44fcf852d239.tar.xz | |
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 'git-parse-remote.sh')
0 files changed, 0 insertions, 0 deletions