4 #

     4 #

     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 *

    10 import errno, util, os, tempfile

    10 import errno, util, os, tempfile

    11 

    11 

    12 def filemerge(repo, fw, fo, wctx, mctx):

    12 def filemerge(repo, fw, fo, wctx, mctx):

    13     """perform a 3-way merge in the working directory

    13     """perform a 3-way merge in the working directory

    14 

    14