diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-07 21:37:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 06:33:03 +0300 |
| commit | 207dfa07919baba034291f1d5169f86272839d59 (patch) | |
| tree | b177a070dc2902fa269865e8d41d3a8e825c4aef /Makefile | |
| parent | 07fef5fc1599d11f5750ae2440e0da6616c297b8 (diff) | |
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |