/brz/remove-bazaar : revision 5455

Committer: Canonical.com Patch Queue Manager
Date: 2010-10-01 08:49:39 UTC
mfrom: <a title="Merged From 5430.7.2" href="/bzr/brz/remove-bazaar/revision/5430.7.2?remember=5200.3.2">(5430.7.2 202374-pull-update-showbase)
Revision ID: pqm@pqm.ubuntu.com-20101001084939-b9q3wnz4duhz2v6y

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

(gz) Enable use of 3-way conflict markers in pull and update by adding
--show-base option (Rory Yorke)

added added

removed removed