| commit | 10f65c239a885336b745cc9d2e1654980ffef41e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Nov 2017 02:06:31 +0000 (27 11:06 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Nov 2017 02:06:31 +0000 (27 11:06 +0900) | ||
| tree | f10ffd064f85e27f3ff8b64e0d26e179df8bca77 | treesnapshot (tar.gz zip) |
| parent | 14c63a9dc093d6738454f6369a4f5663ca732cf7 | commitdiff |
| parent | e9282f02b2f21118f3383608718e38efc3d967e1 | commitdiff |
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
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