| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| Thu, 5 Sep 2013 15:12:45 +0000 (17:12 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 5 Sep 2013 17:50:49 +0000 (10:50 -0700) | |
| commit | e45bda8...6ae2e39ac1e11ba1609f2c363ad4959a |
| tree | 945f666...0103249a2acd6732c946d1f5e8bfe864 (tree) |
| parent | 6897a64...652d83e477389ec1a248b47b8d821db6 (diff) |
| Documentation/git-merge.txt | diff | blob | history |