| author | Denton Liu <liu.denton@gmail.com> |
|---|---|
| Wed, 17 Apr 2019 10:23:28 +0000 (11:23 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 18 Apr 2019 04:49:29 +0000 (13:49 +0900) | |
| commit | 1055997...2fc707a15baf232df2ac481055c14321 |
| tree | 4d32fd9...6b4c02811266f3db3d087858afcd4a53 (tree) |
| parent | d540b70...85ccd08507348785fd210ef8317a864d (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/commit.c | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |