Mercurial > hg > pyhgsh
diff templates/fileannotate-gitweb.tmpl @ 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 | 7b4128f689bd |
children |