| author | Michael J Gruber <git@grubix.eu> |
|---|---|
| Wed, 7 Aug 2019 18:57:06 +0000 (11:57 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 7 Aug 2019 19:37:33 +0000 (12:37 -0700) | |
| commit | a1f3dd7...b303d924f90da30808f7702869430321 |
| tree | b394152...84818ecd5c7b33f38d08fdb192be55f3 (tree) |
| parent | f78f6c7...0ca91a48a4b519cc2cf1197d16810f7a (diff) |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history |