diff mercurial/merge.py @ 10353:36b6b5ef7820

prepush: rename variables, refactor
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 07 Feb 2010 00:43:22 +0100
parents 08a0f04b56bd
children ba5e508b5e92
line wrap: on
line diff