diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:11 -0800 |
| commit | 3c362d4baa877bb9c6c332cfdc3aa81461e06024 (patch) | |
| tree | 9f201c9b203ff2fd2a7bf1d40c9b8ec1bf259a5d /Documentation/merge-options.txt | |
| parent | Merge branch 'th/remote-usage' into maint (diff) | |
| parent | core.autocrlf documentation: mention the crlf attribute (diff) | |
| download | tgif-3c362d4baa877bb9c6c332cfdc3aa81461e06024.tar.xz | |
Merge branch 'mo/maint-crlf-doc' into maint
* mo/maint-crlf-doc:
core.autocrlf documentation: mention the crlf attribute
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions