← Back to branch summary

~barbar/brz-extmerge/brz-extmerge-dev

From Revision 22 to 3

expand all expand all

Rev   Summary Authors Tags Date Diff Files
22
fix to make in work with breezy >= 3.1
Flavio Barbara (@por... 3 months ago Diff Files
21
bug fixing
Flavio Barbara 5 years ago Diff Files
20
bug fixing
Flavio Barbara 5 years ago Diff Files
19
ported to python3 and breezy
Flavio Barbara (xuan... 5 years ago Diff Files
18
add support for vim as a default external merge tool
Fred McCann release-1.0.0 9 years ago Diff Files
17
Add additional valid parameter sets
Fred McCann 9 years ago Diff Files
16
merge from Denny Duchier to handle subprocess.call better
Erik Bagfors 14 years ago Diff Files
15
Merge in Daniel Hahler's work for Beyond Compare
Erik Bagfors 15 years ago Diff Files
14
fixed some small documentation issues
Erik Bagfors 15 years ago Diff Files
13
merge in distutils branch
Erik Bagfors 15 years ago Diff Files
12
Caught attribute error on lazy registration in older version...
Rob Connolly 16 years ago Diff Files
11
Use lazy registration for extmerge command
Aaron Bentley 16 years ago Diff Files
10
merge in support for other external mergers, such as meld
Erik Bagfors 17 years ago Diff Files
9
pep8-ify
Erik Bagfors 17 years ago Diff Files
8
fix for small typo
Erik Bagfors 17 years ago Diff Files
7
Make --all a local option instead of using the global one th...
Ian Clatworthy 17 years ago Diff Files
6
bzr api fix
Erik Bågfors 18 years ago Diff Files
5
updates for bzr.dev from LarstiQ
Erik Bågfors 18 years ago Diff Files
4
use bzr exceptions for errors
Erik Bågfors 19 years ago Diff Files
3
better error message
Erik Bågfors 19 years ago Diff Files