Mercurial > hg > mercurial-crew-with-dirclash
diff contrib/hgdiff @ 2264:fdb699b5e132
localrepo.update: abort if outstanding merges, instead of warn/return 1
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 11 May 2006 09:43:50 -0700 |
parents | e7e6504c4989 |
children | 0f308690bda8 |