X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fresolve_svn.sh;h=15acfd4afe79badf1a396228187445a0e1383583;hb=318b779c5d45c9c073e68e16dcd680f250ef9053;hp=b75979738722604de485d217b321a6dc64104009;hpb=f63ace5a19fa84c8daf669684ac189575d1eb25b;p=feisty_meow.git

diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh
index b7597973..15acfd4a 100644
--- a/scripts/rev_control/resolve_svn.sh
+++ b/scripts/rev_control/resolve_svn.sh
@@ -6,6 +6,8 @@
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
 
+save_terminal_title
+
 ##############
 
 filename="$1"; shift
@@ -16,6 +18,7 @@ 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"
 
+restore_terminal_title