diff mercurial/merge.py @ 3181:725e3d3145d8

factor opts: walk options
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 29 Sep 2006 18:39:32 +0200
parents a9e75b371315
children e67c22bc8bba
line wrap: on
line diff