| author | Wincent Colaiuta <win@wincent.com> |
|---|---|
| Thu, 26 Mar 2009 09:39:04 +0000 (10:39 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 26 Mar 2009 16:38:58 +0000 (09:38 -0700) | |
| commit | 9fe0053...c693929d4dec29690fe7660106fe056a |
| tree | 668b4ad...1bd1856be21517332165679ccaebf337 (tree) |
| parent | eed1fcd...6d8893ab687c700e1729faea025ba7a8 (diff) |
| Documentation/git-merge.txt | diff | blob | history |