| author | Petr Baudis <pasky@suse.cz> |
|---|---|
| Sat, 19 Jul 2008 18:17:22 +0000 (20:17 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Sat, 19 Jul 2008 18:25:27 +0000 (11:25 -0700) | |
| commit | c0be8aa...6b85f3f18fd4c49dfbda14c2943ccda7 |
| tree | e9917ee...7cc05797a1599ecda7888d35c53ef06e (tree) |
| parent | 8575ea5...9ec4f0ea8b292bca7b262f221c5aa122 (diff) |
| Documentation/git-merge.txt | diff | blob | history |