author | Junio C Hamano <gitster@pobox.com> | |
Thu, 19 Oct 2017 05:45:43 +0000 (14:45 +0900) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 19 Oct 2017 05:45:43 +0000 (14:45 +0900) | ||
commit | 9f8468be43df74665bfd9fd925d8ab6fc74f963f | |
tree | 0b21244428d8227366c738ee2dfa2a94fe3af808 | tree | snapshot |
parent | 660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3 | commit | diff |
parent | 488aa65c8fdad35869d7ac47180ad1688262788f | commit | diff |
Documentation/git-merge.txt | diff1 | | diff2 | | blob | history |
Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |