/brz/remove-bazaar

(root)/brz/remove-bazaar » Changes to breezy/mergetools.py from revision 7532

From Revision 7532

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
7493		Drop unnecessary imports from __future__. Drop unnecessary imports from __future__. Merged from https://code.launchpad.net/~jelmer/brz/drop-future/+merge/379372	Jelmer Vernooij	5 years ago
7175		Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooij	6 years ago
7165		Remove some unused imports. Remove some unused imports. Merged from https://code.launchpad.net/~jelmer/brz/unused-imports/+merge/358595	Jelmer Vernooij	6 years ago
6996		Merge lp:~jelmer/brz/python3-e Merge lp:~jelmer/brz/python3-e	Jelmer Vernooij	7 years ago
6624		Merge Python3 porting work ('py3 pokes') Merge Python3 porting work ('py3 pokes')	Jelmer Vernooij	8 years ago
6623		Merge rename to breezy. Merge rename to breezy.	Jelmer Vernooij	8 years ago
6493		(vila) Merge 2.5 branch (Vincent Ladeuil) (vila) Merge 2.5 branch (Vincent Ladeuil)	Patch Queue Manager	13 years ago
6386		(jelmer) Use the absolute_import feature everywhere in bzrli... (jelmer) Use the absolute_import feature everywhere in bzrlib,  and add a source test to make sure it's used everywhere. (Jelmer Vernooij)	Patch Queue Manager	13 years ago
5632		(vila) Added external merge tool management module, (vila) Added external merge tool management module,  bzrlib.mergetools. (Gordon Tyler)	Canonical.com Patch ...	14 years ago