From 7e18398781b056f858ef60200e24b0f8ab394cfe Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 20 Jun 2013 13:12:44 +0300 Subject: commit, db: make file conflicts and script errors non-fatal fixes #1482 --- test/fix4.test | 2 +- test/fix5.test | 2 +- test/fix6.test | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/fix4.test b/test/fix4.test index 431266b..8005d5f 100644 --- a/test/fix4.test +++ b/test/fix4.test @@ -4,5 +4,5 @@ --test-world a fix b @EXPECT -(1/1) Re-installing b (1) +(1/1) Reinstalling b (1) OK: 0 MiB in 2 packages diff --git a/test/fix5.test b/test/fix5.test index 33029fc..3c00d94 100644 --- a/test/fix5.test +++ b/test/fix5.test @@ -4,5 +4,5 @@ --test-world a fix a @EXPECT -(1/1) Re-installing a (1) +(1/1) Reinstalling a (1) OK: 0 MiB in 2 packages diff --git a/test/fix6.test b/test/fix6.test index c6dc6bd..ff87a10 100644 --- a/test/fix6.test +++ b/test/fix6.test @@ -5,6 +5,6 @@ --depends fix a @EXPECT -(1/2) Re-installing b (1) -(2/2) Re-installing a (1) +(1/2) Reinstalling b (1) +(2/2) Reinstalling a (1) OK: 0 MiB in 2 packages -- cgit v1.2.3-70-g09d2