equal
deleted
inserted
replaced
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
11 # GNU General Public License for more details. |
11 # GNU General Public License for more details. |
12 # |
12 # |
13 # You should have received a copy of the GNU General Public License |
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 |
14 # along with this program; if not, see <http://www.gnu.org/licenses/>. |
15 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
|
16 |
15 |
17 import unittest |
16 import unittest |
18 from unittest import TestCase |
17 from unittest import TestCase |
19 from mercurial import util, simplemerge |
18 from mercurial import util, simplemerge |
20 |
19 |