Description
Conflict diffs are broken always for me. It seems like the difflib does not like \r\n and does not recognize the lines correctly.
Example
Details
MoinMoin Version |
|
Workaround
Discussion
- Just do a conflicting edit and the diff in the reject will be broken.
Plan
- Priority:
- Assigned to: Nir
- Status: Fixed in patch 341