~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes to bzrlib/textmerge.py from revision 6622

From Revision 6622

Rev	Summary	Authors	Date
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	12 years ago
5326	(vila) Cleanup tests importing get_transport. (Vincent Ladeu... (vila) Cleanup tests importing get_transport. (Vincent Ladeuil)	Canonical.com Patch ...	14 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 ...	14 years ago
4193	(mbp) merge update to FSF address (mbp) merge update to FSF address	Canonical.com Patch ...	15 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 ...	15 years ago
1733	(jam) Updates to PatienceDiff for performance, and other cle... (jam) Updates to PatienceDiff for performance, and other cleanups.	Canonical.com Patch ...	18 years ago
1732	Use patience for two-way merge Use patience for two-way merge	Canonical.com Patch ...	18 years ago
1669	implementation of --reprocess for weave merge implementation of --reprocess for weave merge	Canonical.com Patch ...	18 years ago