Viewing all changes in revision 585.
- Committer: Andrew Bennetts
- Date: 2011-07-25 06:26:46 UTC
- Revision ID: andrew.bennetts@canonical.com-20110725062646-oofmrmfmywavk6ww
Workaround bug 815700 in dpkg-mergechangelogs (it emits slightly non-standard conflict markers), and link to bug 815704 in an XXX comment in a test.
- files modified:
- merge_changelog.py
expand all
collapse all
added
removed
