diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-16 11:55:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-16 11:55:35 -0700 |
| commit | 29504118f8528f658fd0bfc02d8d78d4c01dc2cc (patch) | |
| tree | 0412494891ef327fa7070c9fca192ae418e5fe2b /Makefile | |
| parent | 6abf5c0c6fb2ad9bb24444171d306262a8c8f4a2 (diff) | |
| parent | 40dad96e41fcb96e31bdf11deec3c7bf6261adbe (diff) | |
| download | git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.gz git-29504118f8528f658fd0bfc02d8d78d4c01dc2cc.tar.xz | |
Merge branch 'svn' of http://netz.smurf.noris.de/git/git
[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
and fixed them up while merging.]
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
@@ -94,7 +94,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-findtags.perl + git-findtags.perl git-svnimport.perl SCRIPT_PYTHON = \ git-merge-recursive.py |