diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-09-24 19:49:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 20:33:35 -0700 |
| commit | a06f678eb998862ea83b73e46ece32f99132935b (patch) | |
| tree | d7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5 /.gitignore | |
| parent | gitweb: fix over-eager application of esc_html(). (diff) | |
| download | tgif-a06f678eb998862ea83b73e46ece32f99132935b.tar.xz | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 284db5dffc..25eb4637a6 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,7 @@ git-merge-one-file git-merge-ours git-merge-recur git-merge-recursive +git-merge-recursive-old git-merge-resolve git-merge-stupid git-mktag |