- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
revision
|
1563.2.20 | 18 years ago | Robert Collins | Add a revision store test adapter. |
|
||
|
versioned
|
1563.2.8 | 18 years ago | Robert Collins | Move WeaveStore down into bzrlib.store.versioned.w |
|
||
__init__.py |
1563.2.14 | 18 years ago | Robert Collins | Prepare weave store to delegate copy details to th | 11.3 KB |
|
|
|
text.py |
1534.7.158 | 19 years ago | Aaron Bentley | Merged John Meinel's integration | 4.3 KB |
|
|