aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-18 16:28:39 -0400
committerJoey Hess <joey@kitenet.net>2010-07-18 16:28:39 -0400
commit773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe (patch)
tree82a81b26153f174357a89ae67519151c0ea5372e /t
parent775fefeea72209cc4eae1bbe314bd94491bcb1b3 (diff)
downloadikiwiki-773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe.tar
ikiwiki-773db5a35e5b81fee3f1f8bf48dffc1dd4f3e2fe.tar.gz
avoid error if two source files render the same destination file
There are two sub-caces. If both source files still exist, the winner that renders the destination file is undefined. If one source file is deleted and the other added, in a refresh, the new file will take over the destination file.
Diffstat (limited to 't')
-rwxr-xr-xt/conflicts.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/conflicts.t b/t/conflicts.t
index ac270e806..81b2c12cb 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
# Tests for bugs relating to conflicting files in the srcdir
use warnings;
use strict;
-use Test::More tests => 48;
+use Test::More tests => 76;
# setup
my $srcdir="t/tmp/src";