author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> |
---|---|
Sun, 21 Feb 2016 22:59:01 +0000 (19:59 -0300) | |
committer | Junio C Hamano <gitster@pobox.com> |
Mon, 22 Feb 2016 18:42:52 +0000 (10:42 -0800) |
Documentation/merge-strategies.txt | patch | blob | history |