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 |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 7.5 KB |
|
|
|
v08.py |
4415.2.2 | 16 years ago | Martin Pool | Remove one use of DummyProgress | 20.2 KB |
|
|
|
v09.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.4 KB |
|
|
|
v4.py |
4543.2.21 | 16 years ago | John Arbash Meinel | A few more tiny tweaks to comments, etc. | 30.5 KB |
|
|