diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-28 13:56:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-15 10:24:34 -0800 |
| commit | c0353c78e80434b9385e134c69b54b048c382077 (patch) | |
| tree | 8acb805eff8cd33f0438c46d98de31a747bfcf8d /Documentation/merge-strategies.txt | |
| parent | strbuf: give strbuf_getline() to the "most text friendly" variant (diff) | |
| download | tgif-c0353c78e80434b9385e134c69b54b048c382077.tar.xz | |
hash-object: read --stdin-paths with strbuf_getline()
The list of paths could have been written with a DOS editor.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions