naming fixes, terminal title fixes
[feisty_meow.git] / scripts / rev_control / resolve_svn.sh
index e1d4913a8d78c290c1c4ee91423f955b9226fe17..15acfd4afe79badf1a396228187445a0e1383583 100644 (file)
@@ -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
@@ -18,4 +20,5 @@ fi
 svn resolve --accept=working "$filename"
 exit_on_error "resolving tree conflict by accepting the working directory as the right one"
 
+restore_terminal_title