equal
deleted
inserted
replaced
2 # |
2 # |
3 # Copyright 2006 Brendan Cully <brendan@kublai.com> |
3 # Copyright 2006 Brendan Cully <brendan@kublai.com> |
4 # Copyright 2007 Chris Mason <chris.mason@oracle.com> |
4 # Copyright 2007 Chris Mason <chris.mason@oracle.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 from i18n import _ |
9 from i18n import _ |
10 from node import hex, nullid, short |
10 from node import hex, nullid, short |
11 import base85, cmdutil, mdiff, util, diffhelpers, copies |
11 import base85, cmdutil, mdiff, util, diffhelpers, copies |
12 import cStringIO, email.Parser, os, re |
12 import cStringIO, email.Parser, os, re |