X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fresolve_svn.sh;h=15acfd4afe79badf1a396228187445a0e1383583;hb=17c68404134083f61ef0884ddd4ef4df4fdfa992;hp=e1d4913a8d78c290c1c4ee91423f955b9226fe17;hpb=baf5d7c693e351bd775114380dc0111bc3e4028e;p=feisty_meow.git diff --git a/scripts/rev_control/resolve_svn.sh b/scripts/rev_control/resolve_svn.sh index e1d4913a..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 @@ -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