| author | Michael J Gruber <git@grubix.eu> |
|---|---|
| Wed, 23 Aug 2017 12:10:44 +0000 (14:10 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 23 Aug 2017 17:34:57 +0000 (10:34 -0700) | |
| commit | 8e6a6bb...6037da87ac98da280459269168b9f525 |
| tree | 3ccce8b...d8d1251db8c735b2edf26b1bfa6c059e (tree) |
| parent | 62dc42b...370b123924ba3423d51976e78d13a924 (diff) |
| builtin/merge.c | diff | blob | history |