diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-07 17:24:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-08 00:50:01 (GMT) |
| commit | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df (patch) | |
| tree | 1245fa311746c7d0c0ec78a7d773a57edb5460a5 /Makefile | |
| parent | 1c6669351a47c834cceb75d6044a1aae259fc69f (diff) | |
| download | git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.zip git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.gz git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -240,7 +240,6 @@ SCRIPT_SH += git-lost-found.sh SCRIPT_SH += git-merge-octopus.sh SCRIPT_SH += git-merge-one-file.sh SCRIPT_SH += git-merge-resolve.sh -SCRIPT_SH += git-merge.sh SCRIPT_SH += git-merge-stupid.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-parse-remote.sh @@ -515,6 +514,7 @@ BUILTIN_OBJS += builtin-ls-remote.o BUILTIN_OBJS += builtin-ls-tree.o BUILTIN_OBJS += builtin-mailinfo.o BUILTIN_OBJS += builtin-mailsplit.o +BUILTIN_OBJS += builtin-merge.o BUILTIN_OBJS += builtin-merge-base.o BUILTIN_OBJS += builtin-merge-file.o BUILTIN_OBJS += builtin-merge-ours.o |