rebase: implement --merge via the interactive machinery

diff --git a/Makefile b/Makefile
index 1a44c811aa56330327172cf693c61f9a221e4e16..82e1eb1a4a690ba58b55c62f1971403272545fc5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -628,7 +628,6 @@ SCRIPT_LIB += git-parse-remote
 SCRIPT_LIB += git-rebase--am
 SCRIPT_LIB += git-rebase--common
 SCRIPT_LIB += git-rebase--preserve-merges
-SCRIPT_LIB += git-rebase--merge
 SCRIPT_LIB += git-sh-setup
 SCRIPT_LIB += git-sh-i18n