1 commit

Author	SHA1	Message	Date
Junio C Hamano	a06f678eb9	Deprecate merge-recursive.py ... This renames merge-recursive written in Python to merge-recursive-old, and makes merge-recur as a synonym to merge-recursive. We do not remove merge-recur yet, but we will remove merge-recur and merge-recursive-old in a few releases down the road. Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-09-24 20:33:35 -07:00

Renamed from git-merge-recursive.py (Browse further)