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

~markgius/bzr-extmerge/git-mergetool-support » Changes from revision 17

From Revision 17

Rev	Summary	Authors	Date
17	Add config for git-mergetool style merges Add config for git-mergetool style merges	Mark Gius	12 years ago
16	merge from Denny Duchier to handle subprocess.call better merge from Denny Duchier to handle subprocess.call better	Erik Bagfors	13 years ago
15	Merge in Daniel Hahler's work for Beyond Compare Merge in Daniel Hahler's work for Beyond Compare	Erik Bagfors	14 years ago
14	fixed some small documentation issues fixed some small documentation issues	Erik Bagfors	14 years ago
13	merge in distutils branch merge in distutils branch	Erik Bagfors	14 years ago
12	Caught attribute error on lazy registration in older version... Caught attribute error on lazy registration in older versions of bazaar.	Rob Connolly	15 years ago
11	Use lazy registration for extmerge command Use lazy registration for extmerge command	Aaron Bentley	15 years ago
10	merge in support for other external mergers, such as meld merge in support for other external mergers, such as meld	Erik Bagfors	16 years ago
9	pep8-ify pep8-ify	Erik Bagfors	16 years ago
8	fix for small typo fix for small typo	Erik Bagfors	16 years ago
7	Make --all a local option instead of using the global one th... Make --all a local option instead of using the global one that no longer exists.	Ian Clatworthy	16 years ago
6	bzr api fix bzr api fix	Erik Bågfors	17 years ago
5	updates for bzr.dev from LarstiQ updates for bzr.dev from LarstiQ	Erik Bågfors	17 years ago
4	use bzr exceptions for errors use bzr exceptions for errors	Erik Bågfors	18 years ago
3	better error message better error message	Erik Bågfors	18 years ago
2	you can now set user defined merge tool in configuration you can now set user defined merge tool in configuration	Erik Bågfors	18 years ago
1	initial checkin initial checkin	Erik Bågfors	18 years ago