sequencer (rebase -i): allow continuing with staged changes

diff --git a/mergetools/emerge b/mergetools/emerge
index f96d9e550a138d395ccb23c9496111630d2de594..d1ce513ff5d3b3db14dd1270d2181099e1134c2c 100644 (file)
--- a/mergetools/emerge
+++ b/mergetools/emerge
@@ -15,9 +15,12 @@ merge_cmd () {
                        "$LOCAL" "$REMOTE" \
                        "$(basename "$MERGED")"
        fi
-       status=$?
 }
 
 translate_merge_tool_path() {
        echo emacs
 }
+
+exit_code_trustable () {
+       true
+}