X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fresolve_svn.sh;h=e1d4913a8d78c290c1c4ee91423f955b9226fe17;hb=baf5d7c693e351bd775114380dc0111bc3e4028e;hp=b75979738722604de485d217b321a6dc64104009;hpb=9f3e83fc4e946639c89eeb37b54c21ecc4f40425;p=feisty_meow.git

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index b7597973..e1d4913a 100644
--- 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"