rebase: implement --merge via the interactive machinery

diff --git a/.gitignore b/.gitignore
index 0d77ea5894274c43c4b348c8b52b8e665a1a339e..910b1d2d2f003b8ee076fb0989c4e14c6c5bb1f3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -124,7 +124,6 @@
 /git-rebase--am
 /git-rebase--common
 /git-rebase--interactive
-/git-rebase--merge
 /git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog