comparison mercurial/repo.py @ 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 142b5d5ec9cc
children ffb895f16925
comparison
equal deleted inserted replaced
2262:3d48eb68f3ee 2264:fdb699b5e132