diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:46 -0700 |
| commit | ed319fca3380bd4d68d316f92c5aa777dc785f85 (patch) | |
| tree | c1fcbdcb4d02916fc68f4e25d830ffb52c919914 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'dn/gpg-doc' (diff) | |
| parent | strbuf: describe the return value of strbuf_read_file (diff) | |
| download | tgif-ed319fca3380bd4d68d316f92c5aa777dc785f85.tar.xz | |
Merge branch 'pb/strbuf-read-file-doc'
* pb/strbuf-read-file-doc:
strbuf: describe the return value of strbuf_read_file
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions