equal
deleted
inserted
replaced
2 # |
2 # |
3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
5 # |
5 # |
6 # This software may be used and distributed according to the terms of the |
6 # This software may be used and distributed according to the terms of the |
7 # GNU General Public License version 2, incorporated herein by reference. |
7 # GNU General Public License version 2 or any later version. |
8 |
8 |
9 import os, copy |
9 import os, copy |
10 from mercurial import match, patch, util, error |
10 from mercurial import match, patch, util, error |
11 from mercurial.node import hex, nullid |
11 from mercurial.node import hex, nullid |
12 |
12 |