lp:~doxxx/qbzr/mergetools

Created by Gordon Tyler and last modified
Get this branch:
bzr branch lp:~doxxx/qbzr/mergetools
Only Gordon Tyler can upload to this branch. If you are Gordon Tyler please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Gordon Tyler
Project:
QBzr
Status:
Merged

Recent revisions

1319. By Gordon Tyler

Improved how detected tools are added to the list so that its selection is not cleared.

1318. By Gordon Tyler

Fixed the other code site which modifies self._default.

1317. By Gary van der Merwe

Merge Trunk.

1316. By Gary van der Merwe

qconfig: Don't crash if no default is set.

1315. By Gordon Tyler

Replaced Merge config tab contents with new UI.

1314. By Gordon Tyler

Use missing gettext call for a user-visible string.

1313. By Gordon Tyler

Updated for API change in bzrlib.mergetools.

1312. By Gordon Tyler

Updated NEWS.txt.

1311. By Gordon Tyler

Added label to display external merge tool error instead of showing it in a tooltip on the launch button.

1310. By Gordon Tyler

Fixed Detect merge tools button to not overwrite user's changes with definitions from config.

Branch metadata

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