| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 
|---|---|
| Mon, 1 Aug 2016 11:44:37 +0000 (13:44 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> | 
| Mon, 1 Aug 2016 18:45:27 +0000 (11:45 -0700) | |
| commit | bc9204d...ef6e0672389fdfb0d398fa9a39dba3d5 | 
| tree | f9bc87d...43a40be32881e71828e6f7f9dde210b7(tree) | 
| parent | 3f338f4...b0eb8081660bbf694074a368cf07355e(diff) | 
| merge-recursive.c | diff | blob | history |