LINTIAN

# `debian-adds-svn-conflict-file`

The Debian diff or native package contains a file that looks like a Subversion conflict file. These are generated by Subversion when a conflict was detected while merging local changes with updates from a source repository. Use `svn resolved` to remove them and clear the Subversion conflict state after you have resolved the conflict.

Severity: | `warning`
Experimental: | `false`
Renamed from: | `diff-contains-svn-conflict-file`

## See also

- list of all the affected packages
- the source of this tag