| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 
|---|---|
| Mon, 1 Aug 2016 11:44:45 +0000 (13:44 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> | 
| Mon, 1 Aug 2016 18:45:28 +0000 (11:45 -0700) | |
| commit | dde75cb...561fa8a6bbb2de4c3662dbcc33728938 | 
| tree | 39f1f3a...4755e9e69d4cc64c11457887fd47e220(tree) | 
| parent | bc9204d...ef6e0672389fdfb0d398fa9a39dba3d5(diff) | 
| merge-recursive.c | diff | blob | history |