mergetool: don't require a work tree for --tool-help

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6ec9d3cb40b1e96f75132a11eb625fd42e64885d..f267d8b6c3eea5c557e63814e40a9ef38b776354 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1049,14 +1049,14 @@ fi
 
 
 has_action "$todo" ||
-       die_abort "Nothing to do"
+       return 2
 
 cp "$todo" "$todo".backup
 git_sequence_editor "$todo" ||
        die_abort "Could not execute editor"
 
 has_action "$todo" ||
-       die_abort "Nothing to do"
+       return 2
 
 expand_todo_ids