To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-10-01 08:49:39 UTC
- mfrom: (5430.7.2 202374-pull-update-showbase)
- Revision ID: pqm@pqm.ubuntu.com-20101001084939-b9q3wnz4duhz2v6y
(gz) Enable use of 3-way conflict markers in pull and update by adding
--show-base option (Rory Yorke)
--show-base option (Rory Yorke)
| 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 |
5448.2.1 | 14 years ago | Martin | Fix some "its" vs. "it's" spelling confusion in bz | 35.5 KB |
|
|