To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Andrew Bennetts
- Date: 2010-04-22 07:35:06 UTC
- 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.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
5110.1.1 | 15 years ago | Martin Pool | Merge 2.1.1, especially the fetch format warning, | 14.7 KB |
|
|
|
text.py |
5110.1.1 | 15 years ago | Martin Pool | Merge 2.1.1, especially the fetch format warning, | 19.1 KB |
|
|