equal
deleted
inserted
replaced
646 |
646 |
647 ``eol`` |
647 ``eol`` |
648 When set to 'strict' patch content and patched files end of lines |
648 When set to 'strict' patch content and patched files end of lines |
649 are preserved. When set to ``lf`` or ``crlf``, both files end of lines |
649 are preserved. When set to ``lf`` or ``crlf``, both files end of lines |
650 are ignored when patching and the result line endings are |
650 are ignored when patching and the result line endings are |
651 normalized to either LF (Unix) or CRLF (Windows). |
651 normalized to either LF (Unix) or CRLF (Windows). When set to |
|
652 ``auto``, end of lines are again ignored while patching but line |
|
653 endings in patched files are normalized to their original setting |
|
654 on a per-file basis. |
652 Default: strict. |
655 Default: strict. |
653 |
656 |
654 |
657 |
655 ``paths`` |
658 ``paths`` |
656 """"""""" |
659 """"""""" |