diff options
| author | Mattias Andrée <m@maandree.se> | 2024-11-27 23:06:04 +0100 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2024-11-27 23:06:04 +0100 |
| commit | 507ceb22e8f2b53d47a729cab1095f7d521e23c8 (patch) | |
| tree | 4d9ddc2d7d6ebde324c0ab6a7b1861c9d831a3f0 /.gitignore | |
| parent | Use git attributes to determine conflict marker size (diff) | |
| download | git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.gz git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.bz2 git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.xz | |
Fix support for CRLF line endings (which git may actually produce on conflict marker lines)HEAD1.0.4master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions