| author | Elijah Newren <newren@gmail.com> |
|---|---|
| Sun, 1 Jul 2018 01:25:03 +0000 (18:25 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 11 Jul 2018 16:38:36 +0000 (09:38 -0700) | |
| commit | 55f39cf...551bd468065306328efdb78933b36b69 |
| tree | 7a7e686...d5447d82cceb84ad9ad860bddbf008a2 (tree) |
| parent | eddd1a4...1d935420e1746108ecfee564114a129f (diff) |
| Documentation/git-merge.txt | diff | blob | history |