diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-14 00:50:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-14 00:54:35 (GMT) |
| commit | 4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch) | |
| tree | 73e3b0ca16e8ea83e9f761af476736c29b24caf9 /Makefile | |
| parent | f8f2aaa17297d6b21c84641edc2f6135575a003c (diff) | |
| parent | 03840fc32d783be6750bf7e41a89687b8c3053eb (diff) | |
| download | git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.zip git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.gz git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.bz2 | |
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -291,6 +291,7 @@ BUILTIN_OBJS = \ builtin-ls-tree.o \ builtin-mailinfo.o \ builtin-mailsplit.o \ + builtin-merge-base.o \ builtin-merge-file.o \ builtin-mv.o \ builtin-name-rev.o \ |