modified error handling methods

[feisty_meow.git] / scripts / rev_control / resolve_svn.sh

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index b75979738722604de485d217b321a6dc64104009..e1d4913a8d78c290c1c4ee91423f955b9226fe17 100644 (file)
--- a/scripts/rev_control/resolve_svn.sh
+++ b/scripts/rev_control/resolve_svn.sh
@@ -16,6 +16,6 @@ if [ -z "$filename" ]; then
 fi
 
 svn resolve --accept=working "$filename"
-test_or_die "resolving tree conflict by accepting the working directory as the right one"
+exit_on_error "resolving tree conflict by accepting the working directory as the right one"