lp:~markgius/bzr-extmerge/git-mergetool-support

Created by Mark Gius on 2011-06-03 and last modified on 2011-06-03
Get this branch:
bzr branch lp:~markgius/bzr-extmerge/git-mergetool-support
Only Mark Gius can upload to this branch. If you are Mark Gius please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mark Gius
Project:
External merge
Status:
Development

Recent revisions

17. By Mark Gius on 2011-06-03

Add config for git-mergetool style merges

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.

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

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:~zindar/bzr-extmerge/trunk
This branch contains Public information 
Everyone can see this information.

Subscribers