To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2009-05-01 18:09:24 UTC
- Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.
This is because the final 'lines' are different, but something occurred
on each side.
This is because the final 'lines' are different, but something occurred
on each side.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
index.txt |
4031.3.2 | 16 years ago | Matt Nordhoff | Merge bzr.dev, fixing conflicts. | 8.3 KB |
|
|