| author | Albert L. Lash, IV <redacted> | |
| Sat, 8 Feb 2014 20:41:34 +0000 (15:41 -0500) | ||
| committer | Junio C Hamano <redacted> | |
| Tue, 11 Feb 2014 19:02:59 +0000 (11:02 -0800) | ||
| commit | 13f72a1d5faacfdfea43e2fd961cb4009206a605 | |
| tree | 7ad95f4a26fe4e22caf42d1306556dfc085f2d6d | tree | snapshot |
| parent | 6a7071958620dadcce84e4faaa470407ae3d4108 | commit | diff |
| Documentation/merge-strategies.txt | diff | blob | history |