lp:~vila/bzr/mergetool-doc

Created by Vincent Ladeuil on 2012-09-19 and last modified on 2012-10-10
Get this branch:
bzr branch lp:~vila/bzr/mergetool-doc
Only Vincent Ladeuil can upload to this branch. If you are Vincent Ladeuil please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Vincent Ladeuil
Project:
Bazaar
Status:
Merged

Recent revisions

6568. By Vincent Ladeuil on 2012-10-10

Fix formattting.

6567. By Vincent Ladeuil on 2012-10-10

Don't explain gory details, most users won't care.

6566. By Vincent Ladeuil on 2012-09-19

Tone down ;)

6565. By Vincent Ladeuil on 2012-09-19

Clarify why mergetool templates cannot be displayed by bzr config TEMPLATE

6564. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Add a config option for the progress bar type. (Vincent Ladeuil)

6563. By Patch Queue Manager <email address hidden> on 2012-09-19

(jam) Merge bzr-2.5.2-dev into bzr trunk to get the ConnectionReset
 fixes.

6562. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Clarify option references expansion for `bzr config`. (Vincent
 Ladeuil)

6561. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Fix obscure and misleading warning when trying to delete an unknown
 config option. (Vincent Ladeuil)

6560. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Remove obsolete (and not used anymore) code and its associated tests
 (covered by other tests in test_http.py). (Vincent Ladeuil)

6559. By Patch Queue Manager <email address hidden> on 2012-09-14

(jelmer) Merge the ping plugin. (Jelmer Vernooij)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers