| author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> |
|---|---|
| Wed, 17 Feb 2016 03:15:26 +0000 (01:15 -0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 17 Feb 2016 18:20:52 +0000 (10:20 -0800) | |
| commit | 1b47ad1...0b55f50a7a98c180e18d80f0f8f17a67 |
| tree | 196dcd6...914dca5b4a8329a7d54b599680a7074c (tree) |
| parent | d2b11ec...7eccc4dfc22a8fc1182d9341458dd9cb (diff) |
| Documentation/merge-strategies.txt | diff | blob | history | |
| merge-recursive.c | diff | blob | history |