diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:30:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:30:34 -0700 |
commit | ea5b2dd28f7dc6e0f331af2aad13e281e7a9a408 (patch) | |
tree | fefbc4f2aeaf24b4fa1903650c590d2042e06bf9 /Documentation/merge-options.txt | |
parent | Merge branch 'jk/sha1dc' (diff) | |
download | tgif-ea5b2dd28f7dc6e0f331af2aad13e281e7a9a408.tar.xz |
Seventh batch for 2.13
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions