| 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) | |
| commit | e2a37ec...b03456bc9131f7c1fe68e1742bf28953 |
| tree | a00d315...adc01957ede0704f2d27138ce72b04be (tree) |
| parent | bfaab48...5ad235dd7612eff46923a881f0b4b21d (diff) |
| parent | bd9958c...5883e2199ceef21b34d9b26783d30cba (diff) |
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |