| author | Elijah Newren <newren@gmail.com> |
|---|---|
| Sat, 31 Aug 2019 00:23:13 +0000 (17:23 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Sun, 1 Sep 2019 15:53:39 +0000 (08:53 -0700) | |
| commit | 27fd1e4...a70f3787c016f3b7ab75c52aa11a753d |
| tree | 9e92653...f2db7738f94ddac1e1d23fbf784692fb (tree) |
| parent | 75b2f01...0f642b39b0f29b6218515df9b5eb798e (diff) |
| Documentation/merge-options.txt | diff | blob | history |