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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
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 |
|
|