| author | Michael J Gruber <redacted> | |
| Mon, 21 Aug 2017 12:53:14 +0000 (14:53 +0200) | ||
| committer | Junio C Hamano <redacted> | |
| Tue, 22 Aug 2017 00:12:44 +0000 (17:12 -0700) | ||
| commit | e2de82f27128441278da979ef101239c40188064 | |
| tree | 0bd37d3e7c5b12f04ebafed232bee7f3000ca191 | tree | snapshot |
| parent | 4d7268b888d7bb6d675340ec676e4239739d0f6d | commit | diff |
| Documentation/git-merge.txt | diff | blob | history |