| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Tue, 17 May 2016 21:38:39 +0000 (14:38 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 17 May 2016 21:38:39 +0000 (14:38 -0700) | |
| commit | be6ec17...22e523ef4700c612f1ec2baedacd1227 |
| tree | 6606e98...c8a60309c004170a9356f1f9da39d16b (tree) |
| parent | bfc99b6...fe859e16ddcfcbe6ac09f98b8d06b34e (diff) |
| parent | 05a5869...01779e6fb55535aff9b01716aac42dcf (diff) |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |