| author | Matthieu Moy <Matthieu.Moy@imag.fr> |
|---|---|
| Tue, 18 Jun 2013 08:42:55 +0000 (10:42 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 18 Jun 2013 16:19:19 +0000 (09:19 -0700) | |
| commit | 76b80cd...17807ba4a773562df2218980ffa27e4f |
| tree | ca407a1...f467416d9d818aedef7a864763b42f01 (tree) |
| parent | 04a74b6...fa5ef4870263f84ac94a488d9f2ef14a (diff) |
| Documentation/git-merge.txt | diff | blob | history |