To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Martin Pool
- Date: 2006-03-24 19:11:33 UTC
- Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement;
makes sure that killed-[ab] lines next to change reasons aren't
omitted from conflict descriptions.
Add more weave merge tests about line deletion.
makes sure that killed-[ab] lines next to change reasons aren't
omitted from conflict descriptions.
Add more weave merge tests about line deletion.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1185.31.13 | 19 years ago | John Arbash Meinel | Updated the test to also test zip exports. Fixed s | 4.8 KB |
|
|
|
dir_exporter.py |
1185.61.3 | 19 years ago | Jamie Wilkinson | convert tabs to 4-spaces | 1.4 KB |
|
|
|
tar_exporter.py |
1185.61.3 | 19 years ago | Jamie Wilkinson | convert tabs to 4-spaces | 1.9 KB |
|
|
|
zip_exporter.py |
1185.50.34 | 19 years ago | John Arbash Meinel | [merge] Jamie Wilkinson, don't export .bzrignore | 2.6 KB |
|
|