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 Olivia Mackall <olivia@selenic.com> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms of the |
5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2 or any later version. |
6 # GNU General Public License version 2 or any later version. |
7 |
7 |
8 from __future__ import absolute_import |
8 from __future__ import absolute_import |