Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/simplemerge.py @ 7280:810ca383da9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove unused variables
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Oct 2008 19:25:26 +0100
parents e75aab656f46
children bb9f13974d8e
comparison
equal deleted inserted replaced
7279:1f0f84660dea 7280:810ca383da9c
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
435 orig = local
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: