projects / git / commitdiff
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Mar 2018 18:30:13 +0000 (11:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 21 Mar 2018 18:30:13 +0000 (11:30 -0700) |
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/merge-strategies.txt | patch | | diff1 | | diff2 | | blob | history |