diff tests/test-diffdir.out @ 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 7544700fd931
children 000d122071b5
line wrap: on
line diff