diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 18:23:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 18:23:45 -0800 |
| commit | 77131db5855ed044e30706aa1219d79126686f00 (patch) | |
| tree | b4623dfb4ed7399b8a40bbf27723ab47ea3588a6 /Makefile | |
| parent | 7141b3b78099941f25b17388f56a917d4f7af51d (diff) | |
| parent | 390cb0c17a3a0751cfb7490a496930872f752d27 (diff) | |
| download | git-77131db5855ed044e30706aa1219d79126686f00.tar.gz git-77131db5855ed044e30706aa1219d79126686f00.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -93,7 +93,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \ - git-svnimport.perl git-mv.perl + git-svnimport.perl git-mv.perl git-cvsexportcommit.perl SCRIPT_PYTHON = \ git-merge-recursive.py |