diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:31 +0900 |
| commit | 10f65c239a885336b745cc9d2e1654980ffef41e (patch) | |
| tree | f10ffd064f85e27f3ff8b64e0d26e179df8bca77 /line-range.h | |
| parent | 14c63a9dc093d6738454f6369a4f5663ca732cf7 (diff) | |
| parent | e9282f02b2f21118f3383608718e38efc3d967e1 (diff) | |
| download | git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.gz git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.xz | |
Merge branch 'jc/ignore-cr-at-eol'
The "diff" family of commands learned to ignore differences in
carriage return at the end of line.
* jc/ignore-cr-at-eol:
diff: --ignore-cr-at-eol
xdiff: reassign xpparm_t.flags bits
Diffstat (limited to 'line-range.h')
0 files changed, 0 insertions, 0 deletions