| author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> |
|---|---|
| Wed, 17 Feb 2016 03:15:25 +0000 (01:15 -0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 17 Feb 2016 18:20:51 +0000 (10:20 -0800) | |
| commit | d2b11ec...7eccc4dfc22a8fc1182d9341458dd9cb |
| tree | 2d4e5a3...245f8724b17da2810cf537ec9ff86852 (tree) |
| parent | 7548842...5bb580df159e58defa81cdd30b5c430c (diff) |
| Documentation/merge-strategies.txt | diff | blob | history | |
| merge-recursive.c | diff | blob | history | |
| merge-recursive.h | diff | blob | history |