lp:~pickscrape/bzr-extmerge/choose-mergetool

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~zindar/bzr-extmerge/trunk

No reviews requested

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11. By Russ Brown on 2008-05-10

Offer the user the choice of which merge tool they would like to use if it is not configured.

Also prompts about how to configure it.

10. By Erik Bågfors on 2008-03-11

merge in support for other external mergers, such as meld

9. By Erik Bågfors on 2008-03-11

pep8-ify

8. By Erik Bågfors on 2008-03-03

fix for small typo

7. By Ian Clatworthy on 2007-07-13

Make --all a local option instead of using the global one that no longer exists.

6. By Erik Bågfors on 2006-11-22

bzr api fix

5. By Erik Bågfors on 2006-06-19

updates for bzr.dev from LarstiQ

4. By Erik Bågfors on 2006-02-18

use bzr exceptions for errors

3. By Erik Bågfors on 2006-02-18

better error message

2. By Erik Bågfors on 2006-02-18

you can now set user defined merge tool in configuration