diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 11:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:23 -0700 |
| commit | 1feeaaf26bff51996f9f96c6dc41ca0f95ab5fc4 (patch) | |
| tree | 3c0b71852cf973f30cce21e7fc5f4f3f5af72e94 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'jc/post-c89-rules-doc' into maint (diff) | |
| download | tgif-1feeaaf26bff51996f9f96c6dc41ca0f95ab5fc4.tar.xz | |
Merge fixes made on the 'master' front
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions