diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:26:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:32:17 (GMT) |
| commit | 660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3 (patch) | |
| tree | d868823b6cfa38707947a6955e60e7428efdfd78 /Documentation/merge-options.txt | |
| parent | 25baa8ef90beb5be5d0ac2a9176fbc72d43d488e (diff) | |
| parent | 4c2224e83951a685185bb8c1f83b28e22fee0e27 (diff) | |
| download | git-660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3.zip git-660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3.tar.gz git-660fb3dfa8f3e42b287ee7e27a36ecd2420b89c3.tar.bz2 | |
Sync with maint
* maint:
Prepare for 2.14.3
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions