To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-02-10 15:46:03 UTC
- mfrom: (4985.3.21 update)
- Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
en
|
3089.3.6 | 17 years ago | Ian Clatworthy | make help topics more discoverable |
|
||
|
es
|
4597.5.2 | 15 years ago | Vincent Ladeuil | doc/es/user-guide/resolving_conflicts.txt is reall |
|
||
__init__.py |
4988.4.2 | 15 years ago | Martin Pool | Change url to canonical.com or wiki, plus some doc | 34.6 KB |
|
|