summaryrefslogtreecommitdiff
path: root/archive.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-25 02:49:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-25 03:33:35 (GMT)
commita06f678eb998862ea83b73e46ece32f99132935b (patch)
treed7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5 /archive.h
parent8391548e5e78677eb81f97334d998418802ea194 (diff)
downloadgit-a06f678eb998862ea83b73e46ece32f99132935b.zip
git-a06f678eb998862ea83b73e46ece32f99132935b.tar.gz
git-a06f678eb998862ea83b73e46ece32f99132935b.tar.bz2
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>
Diffstat (limited to 'archive.h')
0 files changed, 0 insertions, 0 deletions