Viewing all changes in revision 5168.2.2.
- Committer: Andrew Bennetts
- Date: 2010-04-22 07:35:06 UTC
- mto: This revision was merged to the branch mainline in revision 5193.
- Revision ID: andrew.bennetts@canonical.com-20100422073506-7i5pqyhzdj5pcelx
Create a PerFileMerger helper class that is midway between AbstractPerFileMerger and ConfigurableFileMerger. It allows the example merge plugin in the docs (the always conflict *.xml files) to be much, much simpler.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
