1
# Copyright (C) 2010 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
# FIXME: This is totally incomplete but I'm only the patch pilot :-)
19
# Note that the single test from this file is now in
20
# test_merge.TestConfigurableFileMerger -- rbc 20100129.
26
from bzrlib.merge import Merger
27
from bzrlib.plugins import news_merge
28
import bzrlib.plugins.news_merge.news_merge
29
from bzrlib.tests import test_merge_core