- Committer: Andrew Bennetts
- Date: 2010-03-11 04:33:41 UTC
- mfrom: (4797.33.4 2.1)
- Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
tests
|
4869.3.34 | 15 years ago | Vincent Ladeuil | Finish the patch based on reviews. * bzrlib/tests |
|
||
__init__.py |
4797.5.1 | 15 years ago | Robert Collins | Support state on per-file merging to permit more e | 2 KB |
|
|
|
news_merge.py |
4797.5.3 | 15 years ago | Robert Collins | Tweak ConfigurableFileMerger to use class variable | 3.6 KB |
|
|
|
parser.py |
4869.3.27 | 15 years ago | Andrew Bennetts | Move news_merge plugin from contrib to bzrlib/plug | 2.1 KB |
|
|
|
README |
4869.3.34 | 15 years ago | Vincent Ladeuil | Finish the patch based on reviews. * bzrlib/tests | 310 bytes |
|
|