[EMAIL PROTECTED]
After a merge I often find these kinds of conflicts in a file:
.working
===
.merge-right.r15781
Obviously, both are empty lines and there's no need to create a conflict
over this. I don't know how svn compares but I think adding a simple
regex check like
Package: subversion
Version: 1.4.4dfsg1-1
Severity: minor
After a merge I often find these kinds of conflicts in a file:
.working
===
.merge-right.r15781
Obviously, both are empty lines and there's no need to create a conflict
over this. I don't know how svn compares but I think adding
2 matches
Mail list logo
