Re: [PATCH v2 18/31] rebase: extract merge code to new source file

Jeff King [off-list ref] writes:

Looks right, but...

quoted

@@ -382,6 +379,9 @@ SCRIPT_SH += git-web--browse.sh
 SCRIPT_LIB += git-mergetool--lib
 SCRIPT_LIB += git-parse-remote
 SCRIPT_LIB += git-sh-setup
+SCRIPT_LIB += git-rebase--am.sh
+SCRIPT_LIB += git-rebase--interactive.sh
+SCRIPT_LIB += git-rebase--merge.sh

We usually keep these sorted.

Also SCRIPT_LIB omits .sh (which feels inconsistent) and the above will
break the build.

No need to resend, as I've already fixed it up.

Thanks.