Mercurial > hg > dav / file diff

--- a/test/bin-test/test-dav-sync.sh	Sun Aug 25 11:42:55 2019 +0200
+++ b/test/bin-test/test-dav-sync.sh	Thu Aug 29 20:49:05 2019 +0200
@@ -92,7 +92,8 @@
 #
 do_test "dav-sync push (1)" test-dav-sync-push1.sh
 do_test "dav-sync pull (1)" test-dav-sync-pull1.sh
-do_test "dav-sync conflict (1)" test-dav-sync-pull-conflict.sh
+do_test "dav-sync pull conflict (1)" test-dav-sync-pull-conflict.sh
+do_test "dav-sync push conflict (1)" test-dav-sync-push-conflict.sh
 
 # cleanup
 $DAV_BIN rm dav-test-repo/sync/test1 > /dev/null 2>&1