| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Wed, 14 Feb 2018 18:18:55 +0000 (10:18 -0800) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 16 Feb 2018 19:22:43 +0000 (11:22 -0800) | |
| commit | adcc94a...aa7055be4133ebda8b25f4af63285c6d |
| tree | 1411bcf...59e21cf3fa6d6551d9aaa132025cdf62 (tree) |
| parent | b2e45c6...5d09f6a31ce09347ae0a5d2cdfe9dd4e (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| t/t6200-fmt-merge-msg.sh | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |