equal
deleted
inserted
replaced
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
8 from node import * |
8 from node import * |
9 from i18n import gettext as _ |
9 from i18n import gettext as _ |
10 from demandload import * |
10 import errno, util, os, tempfile |
11 demandload(globals(), "errno util os tempfile") |
|
12 |
11 |
13 def filemerge(repo, fw, fo, wctx, mctx): |
12 def filemerge(repo, fw, fo, wctx, mctx): |
14 """perform a 3-way merge in the working directory |
13 """perform a 3-way merge in the working directory |
15 |
14 |
16 fw = filename in the working directory |
15 fw = filename in the working directory |