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
Propose for merging
No branches
dependent on this one.
- Gary van der Merwe: Needs Fixing
-
Diff: 926 lines (+564/-205)5 files modifiedNEWS.txt (+2/-0)
lib/config.py (+254/-99)
lib/conflicts.py (+42/-106)
lib/ui_merge_config.py (+97/-0)
ui/merge_config.ui (+169/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 1319. By Gordon Tyler
-
Improved how detected tools are added to the list so that its selection is not cleared.
- 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