From 7e18398781b056f858ef60200e24b0f8ab394cfe Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Thu, 20 Jun 2013 13:12:44 +0300
Subject: commit, db: make file conflicts and script errors non-fatal

fixes #1482
---
 test/fix5.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/fix5.test')

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
-- 
cgit v1.2.3-60-g2f50