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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bzr |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 2.3 KB |
|
|
|
bzr.simple |
2512.1.1 | 18 years ago | John Arbash Meinel | (Antonin 'gree' Komenda) simple update for bash co | 588 bytes |
|
|
bzrbashprompt.sh |
3528.1.1 | 17 years ago | Jelmer Vernooij | Merge bashprompt script that prints the bzr branch | 324 bytes |
|
|