| author | Jeff King <peff@peff.net> | 
|---|---|
| Tue, 6 Nov 2018 07:50:17 +0000 (02:50 -0500) | |
| committer | Junio C Hamano <gitster@pobox.com> | 
| Wed, 7 Nov 2018 01:11:09 +0000 (10:11 +0900) | |
| commit | edc4d47...54cb1c0ec1550aa50bba86b23720a72f | 
| tree | 446fbde...48b7d06c7f628d8da7f81de4b217fe84(tree) | 
| parent | cae598d...980661a978e2df4fb338518f7bf09572(diff) | 
| builtin/merge.c | diff | blob | history | |
| commit.c | diff | blob | history | |
| commit.h | diff | blob | history |