Mercurial > hg > mercurial-crew-with-dirclash
diff hgeditor @ 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 | 20b621154e17 |
children | d9b8d28c0b94 |