| author | John Keeping <john@keeping.me.uk> |
|---|---|
| Fri, 5 Apr 2013 11:37:30 +0000 (12:37 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 5 Apr 2013 17:57:23 +0000 (10:57 -0700) | |
| commit | 4db4f0f...a43d7e9b9b87a3a40d85ffbdfcef2884 |
| tree | 02b500e...30471bbaddeebcee9d39ef0286f9ad51 (tree) |
| parent | 07924d4...50e5304fb53eb60aaba8aef31d4c4e5e (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |