From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Sep 2005 05:30:13 +0000 (-0700)
Subject: Merge branch 'master' of .
X-Git-Tag: v0.99.7^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4803c2802c11525b11d106247661ea13b2a9ce98?ds=inline;hp=-c

Merge branch 'master' of .
---

4803c2802c11525b11d106247661ea13b2a9ce98
diff --combined Makefile
index e2bbcb590e,a851f56466..9725b1ac9d
--- a/Makefile
+++ b/Makefile
@@@ -40,7 -40,7 +40,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.6
 +GIT_VERSION = 0.99.7
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -83,7 -83,7 +83,7 @@@ SCRIPT_PERL = 
  	git-rename.perl git-shortlog.perl
  
  SCRIPT_PYTHON = \
- 	git-merge-fredrik.py
+ 	git-merge-recursive.py
  
  # The ones that do not have to link with lcrypto nor lz.
  SIMPLE_PROGRAMS = \