External merge for breezy

lp:~barbar/brz-extmerge/brz-extmerge-dev

Created by Flavio Barbara on 2019-05-20 and last modified on 2019-05-20

Only Flavio Barbara can upload to this branch. If you are Flavio Barbara please log in for upload directions.

No branches dependent on this one.

21. By Flavio Barbara <email address hidden> on 2019-05-06: bug fixing
20. By Flavio Barbara <email address hidden> on 2019-05-06: bug fixing
19. By Flavio Barbara on 2019-05-06: ported to python3 and breezy
18. By Fred McCann on 2016-02-19: add support for vim as a default external merge tool
17. By Fred McCann on 2016-02-19: Add additional valid parameter sets
16. By Erik Bagfors <email address hidden> on 2010-07-28: merge from Denny Duchier to handle subprocess.call better
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.

This branch contains Public information

Everyone can see this information.