Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.py @ 7280:810ca383da9c
remove unused variables
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 28 Oct 2008 19:25:26 +0100 |
| parents | e75aab656f46 |
| children | bb9f13974d8e |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Tue Oct 28 19:07:14 2008 +0100 +++ b/mercurial/simplemerge.py Tue Oct 28 19:25:26 2008 +0100 @@ -432,7 +432,6 @@ basetext = readfile(base) othertext = readfile(other) - orig = local local = os.path.realpath(local) if not opts.get('print'): opener = util.opener(os.path.dirname(local))