| author | Nicolas Vigier <boklm@mars-attacks.org> |
|---|---|
| Mon, 14 Oct 2013 23:41:05 +0000 (01:41 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 18 Oct 2013 19:47:33 +0000 (12:47 -0700) | |
| commit | 5f737ac...1bd869e65bff401ad1108581ac504e22 |
| tree | 2f78631...9b3c0b314dd43c4b30d0545c7b01c387 (tree) |
| parent | 92ab409...55f6f8e379a7a0af731dbad7e1d43af0 (diff) |
| Documentation/git-merge.txt | diff | blob | history |