| author | Jari Aalto <jari.aalto@cante.net> |
|---|---|
| Thu, 22 Oct 2009 19:25:20 +0000 (22:25 +0300) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 22 Oct 2009 19:39:18 +0000 (12:39 -0700) | |
| commit | 7c85d27...29784c181ca633fb1465a9c651dbce8a |
| tree | 5b7e2cb...d1f96c48ae875c6ccdd2db85c6fe9b52 (tree) |
| parent | 3f7a9b5...d128151e6eb0b45266779e63e4b2287a (diff) |
| Documentation/merge-options.txt | diff | blob | history |