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) | ||
commit | 83837ec0b43bfd832ea00cd96e8b47c90991c473 | |
tree | 94467dae4ff0595e1829f5465b4f8aaeb0486685 | tree | snapshot |
parent | 1b47ad160b55f50a7a98c180e18d80f0f8f17a67 | commit | diff |
Documentation/merge-strategies.txt | diff | blob | history |