Skip to content

Commit 1c7b76b

Browse files
Miklos Vajnagitster
Miklos Vajna
authored and
gitster
committed
Build in merge
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1c66693 commit 1c7b76b

File tree

6 files changed

+1157
-2
lines changed

6 files changed

+1157
-2
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ SCRIPT_SH += git-lost-found.sh
240240
SCRIPT_SH += git-merge-octopus.sh
241241
SCRIPT_SH += git-merge-one-file.sh
242242
SCRIPT_SH += git-merge-resolve.sh
243-
SCRIPT_SH += git-merge.sh
244243
SCRIPT_SH += git-merge-stupid.sh
245244
SCRIPT_SH += git-mergetool.sh
246245
SCRIPT_SH += git-parse-remote.sh
@@ -515,6 +514,7 @@ BUILTIN_OBJS += builtin-ls-remote.o
515514
BUILTIN_OBJS += builtin-ls-tree.o
516515
BUILTIN_OBJS += builtin-mailinfo.o
517516
BUILTIN_OBJS += builtin-mailsplit.o
517+
BUILTIN_OBJS += builtin-merge.o
518518
BUILTIN_OBJS += builtin-merge-base.o
519519
BUILTIN_OBJS += builtin-merge-file.o
520520
BUILTIN_OBJS += builtin-merge-ours.o

0 commit comments

Comments
 (0)