lp:~zindar/bzr-extmerge/trunk

Branch merges

Propose for merging

3 branches proposed for merging into this one.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

16. By Erik Bagfors <email address hidden> on 2010-07-28

merge from Denny Duchier to handle subprocess.call better

Merged branch lp:~denys.duchier/bzr-extmerge/bzr-extmerge-eacces

15. By Erik Bågfors on 2009-11-25

Merge in Daniel Hahler's work for Beyond Compare

14. By Erik Bågfors on 2009-09-24

fixed some small documentation issues

13. By Erik Bågfors on 2009-09-23

merge in distutils branch

12. By Rob Connolly on 2009-01-27

Caught attribute error on lazy registration in older versions of bazaar.

11. By Aaron Bentley on 2008-10-22

Use lazy registration for extmerge command

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.