To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-01-06 11:28:59 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100106112859-bsqzmnwzntlc8nq3
The bugs aren't fixed until the options are taken into account for text
conflicts too (which requires at least discussion and the ability to
resolve only the conflicted regions as opposed to taking .THIS or .OTHER
as whole).
conflicts too (which requires at least discussion and the ability to
resolve only the conflicted regions as opposed to taking .THIS or .OTHER
as whole).
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4585.1.17 | 16 years ago | Jelmer Vernooij | Skip InterTree tests if from/to test tree formats | 7.6 KB |
|
|
|
test_compare.py |
4722.1.1 | 16 years ago | Andrew Bennetts | Merge lp:bzr/2.0 into lp:bzr, duplicating relevant | 82.7 KB |
|
|