| author | Ramkumar Ramachandra <artagnon@gmail.com> |
|---|---|
| Sun, 16 Mar 2014 22:54:56 +0000 (18:54 -0400) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Mon, 17 Mar 2014 22:13:46 +0000 (15:13 -0700) | |
| commit | 3c3e6f5...45c5e661bc8c338e4e7a9252a14e429e |
| tree | dcabd7b...23e70f7564e7309ee9a5cb4934ac7c7a (tree) |
| parent | 7bbc4e8...db33e0a8e42e77cc05460d4c4f615f4d (diff) |
| Documentation/merge-strategies.txt | diff | blob | history |