lp:~blueyed/bzr-extmerge/bcompare

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~zindar/bzr-extmerge/trunk

Erik Bågfors: Pending requested 2009-11-25

Diff: 36 lines (+6/-4)

1 file modified

extmerge.py (+6/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14. By Daniel Hahler on 2009-11-04

 - Add Beyond Compare to default setup
 - Fix reference to external_merge syntax
 - TODO: ask if the file(s) should get resolved, per file.

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.

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