| author | Albert L. Lash, IV <alash3@bloomberg.net> |
|---|---|
| Sat, 8 Feb 2014 20:41:34 +0000 (15:41 -0500) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 11 Feb 2014 19:02:59 +0000 (11:02 -0800) | |
| commit | 13f72a1...5faacfdfea43e2fd961cb4009206a605 |
| tree | 7ad95f4...26fe4e22caf42d1306556dfc085f2d6d (tree) |
| parent | 6a70719...8620dadcce84e4faaa470407ae3d4108 (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |