diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-25 04:49:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-25 05:33:35 +0200 |
| commit | a06f678eb998862ea83b73e46ece32f99132935b (patch) | |
| tree | d7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5 /builtin-diff-tree.c | |
| parent | gitweb: fix over-eager application of esc_html(). (diff) | |
| download | git-a06f678eb998862ea83b73e46ece32f99132935b.tar.xz git-a06f678eb998862ea83b73e46ece32f99132935b.zip | |
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 'builtin-diff-tree.c')
0 files changed, 0 insertions, 0 deletions