When pulling in darcs, fail if any conflicts occur