| author | Johan Herland <johan@herland.net> |
|---|---|
| Thu, 4 Sep 2008 21:48:48 +0000 (23:48 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 4 Sep 2008 22:14:17 +0000 (15:14 -0700) | |
| commit | 3407a7a...e67b165902be85b0807e9ea789b3c67d |
| tree | 351fd08...956262a01a7721288e2d780fc926fc77 (tree) |
| parent | 70a3f89...33a4cd21631690ba980598fea2249067 (diff) |
| Documentation/git-merge.txt | diff | blob | history |