comparison mercurial/merge.py @ 7131:23bd7383891c

commands: optional options where possible This makes life a lot easier on API users.
author Alexander Solovyov <piranha@piranha.org.ua>
date Sat, 18 Oct 2008 18:05:56 +0200
parents 865c5be0f8df
children 89207edf3973
comparison
equal deleted inserted replaced
7130:204c7850c158 7131:23bd7383891c