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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
launchpad
|
1668.1.8 | 19 years ago | Martin Pool | Merge register-branch plugin into default plugins |
|
||
|
netrc_credential_store
|
3757.3.2 | 16 years ago | Vincent Ladeuil | Add a credential store for '.netrc'. * plugins/ne |
|
||
__init__.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 771 bytes |
|
|