| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Tue, 14 Jan 2014 18:26:21 +0000 (10:26 -0800) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 14 Jan 2014 18:47:36 +0000 (10:47 -0800) | |
| commit | 08f19cf...9bff097e8828a289d2daf5f066e1af9d |
| tree | 06a82c4...281b49cc861b1888e52dd360a5ee025a (tree) |
| parent | 8be1d04...7e9251380a5de80564284f0099774038 (diff) |
| Documentation/merge-options.txt | diff | blob | history |