To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2009-04-29 17:02:36 UTC
- Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
Add a per-implementation test that deleting lines conflicts with modifying lines.
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
BSD-LICENSE.txt |
3221.7.1 | 17 years ago | Matt Nordhoff | Upgrade ConfigObj to version 4.5.1. A couple of t | 2.5 KB |
|
|
|
configobj.txt |
3239.1.1 | 17 years ago | Matt Nordhoff | Upgrade ConfigObj to 4.5.2. There were no changes | 89.4 KB |
|
|
|
validate.txt |
3239.1.1 | 17 years ago | Matt Nordhoff | Upgrade ConfigObj to 4.5.2. There were no changes | 21.1 KB |
|
|