i18n: apply: mark strings for translation

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index eb0f7bc1578fcbfbe6361bf5654a90582ba6a8ac..dc599077f0e55472ae814ed4e15f5b3a1b729caf 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -78,7 +78,7 @@ call_merge () {
                die "$resolvemsg"
                ;;
        2)
-               echo "Strategy: $rv $strategy failed, try another" 1>&2
+               echo "Strategy: $strategy failed, try another" 1>&2
                die "$resolvemsg"
                ;;
        *)
@@ -90,10 +90,13 @@ call_merge () {
 
 finish_rb_merge () {
        move_to_original_branch
-       git notes copy --for-rewrite=rebase < "$state_dir"/rewritten
-       if test -x "$GIT_DIR"/hooks/post-rewrite &&
-               test -s "$state_dir"/rewritten; then
-               "$GIT_DIR"/hooks/post-rewrite rebase < "$state_dir"/rewritten
+       if test -s "$state_dir"/rewritten
+       then
+               git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
+               if test -x "$GIT_DIR"/hooks/post-rewrite
+               then
+                       "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
+               fi
        fi
        rm -r "$state_dir"
        say All done.