diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-23 04:46:07 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 04:46:08 (GMT) |
commit | d13686ff4d17119418a3aa6b901f9c0e640b25b8 (patch) | |
tree | b23c0009a24da6affde36483a2441ed9a230bd85 /git-merge-octopus.sh | |
parent | 3c980083bc404cb62fb87c76d331c48a44c5f50d (diff) | |
parent | c8f7c8b7042ba51f9bfd24aba7aaab4007365380 (diff) | |
download | git-d13686ff4d17119418a3aa6b901f9c0e640b25b8.zip git-d13686ff4d17119418a3aa6b901f9c0e640b25b8.tar.gz git-d13686ff4d17119418a3aa6b901f9c0e640b25b8.tar.bz2 |
Merge branch 'tb/dedup-crlf-tests'
* tb/dedup-crlf-tests:
t0027: tests are not expensive; remove t0025
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions