To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-02-10 15:46:03 UTC
- mfrom: (4985.3.21 update)
- Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts
| 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 |
|
|