summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-20 08:49:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-22 04:55:39 (GMT)
commit7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch)
tree14d84fbaf70277d8ba833391c03860e98c1defe7 /.gitignore
parent594270635732d6320d6e6d7fa127679ae90ef5b1 (diff)
downloadgit-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.zip
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.bz2
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4c8c8e4..7f2cd55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,6 @@ 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