diff options
author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> | 2016-02-21 19:59:01 -0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 10:42:52 -0800 |
commit | 83837ec0b43bfd832ea00cd96e8b47c90991c473 (patch) | |
tree | 94467dae4ff0595e1829f5465b4f8aaeb0486685 /notes.h | |
parent | merge-recursive: more consistent interface (diff) | |
download | tgif-83837ec0b43bfd832ea00cd96e8b47c90991c473.tar.xz |
merge-strategies.txt: fix typo
Signed-off-by: Felipe Gonçalves Assis <felipegassis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.h')
0 files changed, 0 insertions, 0 deletions