| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Wed, 13 Jan 2016 17:20:21 +0000 (18:20 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 13 Jan 2016 19:36:28 +0000 (11:36 -0800) | |
| commit | dcacb1b...ee42d3cc20e4720134f18ab5ba267f3a |
| tree | 7ff2833...67acbd0a4c65bc075a9e93da2ef0360a (tree) |
| parent | df617b5...9e9ebf01cde572b8f78f4dd8bc6c010b (diff) |
| builtin/merge.c | diff | blob | history |