diff mercurial/dirstate.py @ 2283:e506c14382fd

deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents f1fda71e134e
children 5083cba2a777
line wrap: on
line diff