| author | Elijah Newren <newren@gmail.com> |
|---|---|
| Thu, 21 Feb 2019 17:50:29 +0000 (09:50 -0800) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 21 Feb 2019 19:08:23 +0000 (11:08 -0800) | |
| commit | 1ede45e...4b3b3bef8598ca077a60a6483ede99ae |
| tree | f066087...9c6abb6e249db915384cd6af73a46896 (tree) |
| parent | 0d0ac38...6a3bbb9247e39e12623bbcfdd722f24c (diff) |
| Documentation/merge-options.txt | diff | blob | history |