Mercurial > hg > mercurial-crew-with-dirclash
diff contrib/mercurial.el @ 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 | 0ffca0cb9f4b |
children | 48baf9fb1921 |