| author | Miklos Vajna <vmiklos@frugalware.org> |
|---|---|
| Tue, 18 Mar 2008 12:26:43 +0000 (13:26 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 19 Mar 2008 08:43:02 +0000 (01:43 -0700) | |
| commit | 02b00e1...bb372fd13e1ac440e9fbafd223d43af0 |
| tree | 8e5c54c...08aefccafd4f5a9a04637576ed8ff4b5 (tree) |
| parent | 420e9af...98848f9a3994ecb471dc51d5203f51cd (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |