| author | René Scharfe <redacted> | |
| Fri, 5 Aug 2016 21:01:35 +0000 (23:01 +0200) | ||
| committer | Junio C Hamano <redacted> | |
| Fri, 5 Aug 2016 22:11:06 +0000 (15:11 -0700) | ||
| commit | 02a8cfa478bcc5da72be549a2fbcae2f37bac1cd | |
| tree | 6355858d357481cf3b3065191dcc8ed671b6ce39 | tree | snapshot |
| parent | 08df31eeccfe1576971ea4ba42570a424c3cfc41 | commit | diff |
| builtin/merge.c | diff | blob | history |