diff options
author | Junio C Hamano <junkio@cox.net> | 2006-04-22 03:07:08 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-22 03:07:08 -0700 |
commit | 0bc6c140587092bf831786bb81bd7dc0102f752c (patch) | |
tree | d9b9432628daeef27133d43b8eed80c35710cc8e /Makefile | |
parent | Merge branch 'jc/fmt-patch' into next (diff) | |
parent | Libify diff-index. (diff) | |
download | tgif-0bc6c140587092bf831786bb81bd7dc0102f752c.tar.xz |
Merge branch 'jc/diff' into next
* jc/diff:
Libify diff-index.
Libify diff-files.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -199,7 +199,7 @@ LIB_H = \ tree-walk.h log-tree.h DIFF_OBJS = \ - diff-lib.o diffcore-break.o diffcore-order.o \ + diff.o diff-lib.o diffcore-break.o diffcore-order.o \ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ diffcore-delta.o log-tree.o |