equal
deleted
inserted
replaced
1 # filemerge.py - file-level merge handling for Mercurial |
1 # filemerge.py - file-level merge handling for Mercurial |
2 # |
2 # |
3 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms of the |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # GNU General Public License version 2, incorporated herein by reference. |
7 |
7 |
8 from node import short |
8 from node import short |
9 from i18n import _ |
9 from i18n import _ |
10 import util, os, tempfile, simplemerge, re, filecmp |
10 import util, os, tempfile, simplemerge, re, filecmp |
11 |
11 |