author | Felipe Gonçalves Assis <felipeg.assis@gmail.com> |
---|---|
Sun, 21 Feb 2016 22:59:05 +0000 (19:59 -0300) | |
committer | Junio C Hamano <gitster@pobox.com> |
Wed, 24 Feb 2016 18:39:02 +0000 (10:39 -0800) | |
commit | 87892f6 ... 5be16037bc910ca2cf9fa21bb9467f5e |
tree | 6f279a3 ... 4a962388b3b3014b26e25a4bcff712b7 (tree) |
parent | 83837ec ... b43bfd832ea00cd96e8b47c90991c473 (diff) |
merge-recursive.c | diff | blob | history |