430 

   430 

   431     localtext = readfile(local)

   431     localtext = readfile(local)

   432     basetext = readfile(base)

   432     basetext = readfile(base)

   433     othertext = readfile(other)

   433     othertext = readfile(other)

   434 

   434 

   436     local = os.path.realpath(local)

   435     local = os.path.realpath(local)

   437     if not opts.get('print'):

   436     if not opts.get('print'):

   438         opener = util.opener(os.path.dirname(local))

   437         opener = util.opener(os.path.dirname(local))

   439         out = opener(os.path.basename(local), "w", atomictemp=True)

   438         out = opener(os.path.basename(local), "w", atomictemp=True)

   440     else:

   439     else: