Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Deprecate merge-recursive.py | Junio C Hamano | 2006-09-24 |
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> |