Merge of http://members.cox.net/junkio/git-jc.git

diff --git a/Makefile b/Makefile
index 99b4753d34879842b972da9b68694c9d0485f216..a8d41757b02e114826e0bdcbe3a00dcfd39e62f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CC=gcc
 AR=ar
 
 SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
-       git-pull-script git-tag-script
+       git-pull-script git-tag-script git-resolve-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \