| author | René Scharfe <redacted> | |
| Thu, 10 Aug 2017 16:47:55 +0000 (18:47 +0200) | ||
| committer | Junio C Hamano <redacted> | |
| Thu, 10 Aug 2017 20:57:00 +0000 (13:57 -0700) | ||
| commit | de3ce210edb4870b082fab18148f859d2b3c9ae2 | |
| tree | 4391e4595db9840a5aeab9b35b076f6272bf5cf1 | tree | snapshot |
| parent | 7234152e66e52c7601789f6de822bb39590f0595 | commit | diff |
| builtin/merge.c | diff | blob | history |