equal
deleted
inserted
replaced
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 node import hex, nullid, nullrev, short |
8 from node import hex, nullid, nullrev, short |
9 from i18n import _ |
9 from i18n import _ |
10 import os, sys, errno, re, glob, tempfile, time |
10 import os, sys, errno, re, glob, tempfile |
11 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw |
11 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw |
12 import match as _match |
12 import match as _match |
13 |
13 |
14 revrangesep = ':' |
14 revrangesep = ':' |
15 |
15 |