| author | Derrick Stolee <stolee@gmail.com> | 
|---|---|
| Thu, 8 Nov 2018 04:40:31 +0000 (20:40 -0800) | |
| committer | Junio C Hamano <gitster@pobox.com> | 
| Thu, 8 Nov 2018 05:23:54 +0000 (14:23 +0900) | |
| commit | 80cee6e...210120a8a45fc4818e0049f482247b0f | 
| tree | 4ee78d7...433a13358a90704610eaf740f11c64f6(tree) | 
| parent | b8cd1bb...1306e489d73e5cf4ef75a6cdb4c223b7(diff) | 
| merge-recursive.c | diff | blob | history |