lp:~qbzr-dev/qbzr/mergetools

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qbzr at revision 1401

Alexander Belchenko: Approve on 2011-06-25

Diff: 893 lines (+530/-204)

5 files modified

NEWS.txt (+2/-0)
lib/config.py (+276/-98)
lib/conflicts.py (+62/-106)
lib/ui_merge_config.py (+64/-0)
ui/merge_config.ui (+126/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #489915: [master] external diff/merge configuration needs serious rework

High

Fix Released

Link a bug report

Related blueprints

1338. By Gordon Tyler on 2011-05-09

Corrected error message wording.

1337. By Gordon Tyler on 2011-05-09

Fixed bogus references to Qt class.

1336. By Gordon Tyler on 2011-05-09

Protect qconflicts from missing mergetools support in bzr.

1335. By Gordon Tyler on 2011-05-09

Merged from trunk.

1334. By Gordon Tyler on 2011-02-02

Display a nice message in qconfig if bzrlib.mergetools is not available.

1333. By Gordon Tyler on 2011-01-20

Updated for changes in bzr mergetools branch.

1332. By Gordon Tyler on 2011-01-16

Merged from trunk.

1331. By Gordon Tyler on 2011-01-16

Add known merge tools to table model separately so that they can be flagged as non-editable and rendered differently but still be selected as default.

1330. By Gordon Tyler on 2011-01-15

Handle renaming a merge tool correctly.

1329. By Gordon Tyler on 2011-01-15

Use set_user_option instead of set_merge_tool, remove_merge_tool or set_default_merge_tool.