| author | Michael J Gruber <git@drmicha.warpmail.net> |
|---|---|
| Mon, 25 May 2009 16:00:10 +0000 (18:00 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 25 May 2009 18:23:18 +0000 (11:23 -0700) | |
| commit | f5d4c4d...f19084a2d48f55f2f42cac25696a34f5 |
| tree | 63ce883...484cf53825ed061442db4a7c18f042f8 (tree) |
| parent | f5b223a...fdc01455d42ed005b4fd9330b06c2967 (diff) |
| Documentation/merge-options.txt | diff | blob | history |