Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 2922:773c5b82d052
override previous merge with mpm.
merge at ef8ee4477019 was bad.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 16 Aug 2006 10:52:42 -0700 |
parents | addb58e3b41c ef8ee4477019 |
children | 439fd013360d 5ddf7d305a27 |