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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
serializer
|
1185.82.3 | 20 years ago | John Arbash Meinel | Working on creating a factor for serializing chang |
|
||
__init__.py |
4792.7.3 | 16 years ago | Martin | MergeDirective.from_lines claims to want an iterab | 3.5 KB |
|
|
|
apply_bundle.py |
4721.3.2 | 16 years ago | Vincent Ladeuil | Simplify mutable_tree.has_changes() and update cal | 2.9 KB |
|
|
|
bundle_data.py |
4325.3.4 | 16 years ago | Johan Walles | Merge from upstream. | 28.6 KB |
|
|
|
commands.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 3.8 KB |
|
|