diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-07 08:27:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-07 08:33:20 +0300 |
| commit | 6506e156d99bd406661cd5d2e502db7c0960d716 (patch) | |
| tree | 0dbdb4c474e4bca200579d5ea81d353c0a279c90 /.gitignore | |
| parent | 740afd961370ba3925ba3a1edf5b499bb068fd9a (diff) | |
Remove git-merge-recur
This was useful when the current recursive was in development, and
the original Python version was still called git-merge-recursive.
Now the synonym has served us well, it is time to move on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d49994903e..d99372afc4 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,6 @@ git-merge-tree git-merge-octopus git-merge-one-file git-merge-ours -git-merge-recur git-merge-recursive git-merge-resolve git-merge-stupid |