]>
author | Dominic Jäger <dominic.jaeger@gmail.com> | |
Fri, 8 Nov 2019 14:47:01 +0000 (15:47 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 11 Nov 2019 02:04:46 +0000 (11:04 +0900) | ||
commit | 68d40f30c43cd0fa4721a340625f2f58c2525600 | |
tree | 0b2bbf0c2776c42a1db6f8d828441e7c12cfed77 | tree | snapshot |
parent | 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 | commit | diff |
Documentation/merge-strategies.txt | diff | blob | blame | history |