diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-20 11:49:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-22 07:55:39 +0300 |
| commit | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch) | |
| tree | 14d84fbaf70277d8ba833391c03860e98c1defe7 /.gitignore | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
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-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 4c8c8e4115..7f2cd55088 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 |