diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:45 -0700 |
commit | f7927316cf7b6252e27e54cdd2929039253c2422 (patch) | |
tree | 943aebcab6d25dc2567fa0241afb8dd2646e1b20 /Documentation/merge-options.txt | |
parent | 1c22105f2ce6795035f4d030325127dab9736caa (diff) | |
parent | ed008d7bb957ccfbe32c95aad74ee78e0e31de16 (diff) | |
download | git-f7927316cf7b6252e27e54cdd2929039253c2422.tar.gz |
Merge branch 'pb/strbuf-read-file-doc' into maint
Minor doc update.
* pb/strbuf-read-file-doc:
strbuf: describe the return value of strbuf_read_file
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions