| author | Thomas Rast <trast@student.ethz.ch> |
|---|---|
| Sun, 15 Nov 2009 18:25:30 +0000 (19:25 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Sun, 15 Nov 2009 20:26:08 +0000 (12:26 -0800) | |
| commit | d4cbaa1...a774a97dfa9e99aad9188dc802469bb6 |
| tree | d8a4644...db193f3c7c725a6df61b8e94426d260b (tree) |
| parent | 78d553b...d7b269bb22ebd8b1198657c37484a3a0 (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |