summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-07 10:37:03 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-12 19:33:03 -0800
commit207dfa07919baba034291f1d5169f86272839d59 (patch)
treeb177a070dc2902fa269865e8d41d3a8e825c4aef /Makefile
parentblameview: Move the commit info to a pane below the blame window. (diff)
downloadtgif-207dfa07919baba034291f1d5169f86272839d59.tar.xz
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 40bdcff696..6a9431331a 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,7 @@ SCRIPT_SH = \
git-merge-one-file.sh git-parse-remote.sh \
git-pull.sh git-rebase.sh \
git-repack.sh git-request-pull.sh git-reset.sh \
- git-resolve.sh git-revert.sh git-sh-setup.sh \
+ git-revert.sh git-sh-setup.sh \
git-tag.sh git-verify-tag.sh \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \