Merge branch 'js/rebase-am'

diff --git a/Makefile b/Makefile
index 28ee1799d1c78ecc114fd5d6b4fbce32aaec09fa..afa411d727532f95278438851a5ad09292fb7f48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -634,7 +634,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