| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Fri, 22 Dec 2017 14:10:02 +0000 (15:10 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 11 Jul 2018 21:47:05 +0000 (14:47 -0700) | |
| commit | 920f22e...bc2ddc28b1d70eb8167fe17f0f1601eb |
| tree | a9762ca...b073559e1126a381cf80ea6a46eb8993 (tree) |
| parent | e333175...f12da22f4103eec7efe1b5304a9be5e9 (diff) |
| Documentation/git-merge.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history |