/brz/remove-bazaar

(root)/brz/remove-bazaar » Changes to breezy/textmerge.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
7303		Use external patiencediff. Use external patiencediff. Merged from https://code.launchpad.net/~jelmer/brz/external-patiencediff/+merge/363891	Jelmer Vernooij	6 years ago
7175		Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooij	7 years ago
6984		Merge lp:~jelmer/brz/python3-weave Merge lp:~jelmer/brz/python3-weave	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
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
5326		(vila) Cleanup tests importing get_transport. (Vincent Ladeu... (vila) Cleanup tests importing get_transport. (Vincent Ladeuil)	Canonical.com Patch ...	15 years ago
5280		(spiv) Use lazy imports in bzrilb.merge to minimise the star... (spiv) Use lazy imports in bzrilb.merge to minimise the startup cost of  plugins like news_merge. (Andrew Bennetts)	Canonical.com Patch ...	15 years ago
4193		(mbp) merge update to FSF address (mbp) merge update to FSF address	Canonical.com Patch ...	16 years ago
4033		(Marius Kruger) Remove all trailing whitespace and add tests... (Marius Kruger) Remove all trailing whitespace and add tests to         enforce this.	Canonical.com Patch ...	16 years ago
1733		(jam) Updates to PatienceDiff for performance, and other cle... (jam) Updates to PatienceDiff for performance, and other cleanups.	Canonical.com Patch ...	19 years ago
1732		Use patience for two-way merge Use patience for two-way merge	Canonical.com Patch ...	19 years ago
1669		implementation of --reprocess for weave merge implementation of --reprocess for weave merge	Canonical.com Patch ...	19 years ago