From 6506e156d99bd406661cd5d2e502db7c0960d716 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Feb 2007 21:27:09 -0800 Subject: 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 --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') 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 -- cgit v1.2.3