OSDN Git Service

merge-strategies.txt: fix typo
authorFelipe Gonçalves Assis <felipeg.assis@gmail.com>
Sun, 21 Feb 2016 22:59:01 +0000 (19:59 -0300)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 18:42:52 +0000 (10:42 -0800)
commit83837ec0b43bfd832ea00cd96e8b47c90991c473
tree94467dae4ff0595e1829f5465b4f8aaeb0486685
parent1b47ad160b55f50a7a98c180e18d80f0f8f17a67
merge-strategies.txt: fix typo

Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt