| author | SZEDER Gábor <szeder.dev@gmail.com> |
|---|---|
| Thu, 8 Feb 2018 15:56:53 +0000 (16:56 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 8 Feb 2018 18:54:27 +0000 (10:54 -0800) | |
| commit | 93b4b03...3c8d9d3600fc27b7023dab0d9d9be739 |
| tree | 5db1e52...e98b2497ea18ba5cd3c15f8119c2c1ec (tree) |
| parent | 927c1a6...3a9320368a95046f855371b0ce473263 (diff) |
| t/t5536-fetch-conflicts.sh | diff | blob | history |