| author | Michael J Gruber <git@grubix.eu> |
|---|---|
| Mon, 21 Aug 2017 12:53:14 +0000 (14:53 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 22 Aug 2017 00:12:44 +0000 (17:12 -0700) | |
| commit | e2de82f...7128441278da979ef101239c40188064 |
| tree | 0bd37d3...7c5b12f04ebafed232bee7f3000ca191 (tree) |
| parent | 4d7268b...88d7bb6d675340ec676e4239739d0f6d (diff) |
| Documentation/git-merge.txt | diff | blob | history |