xdl_merge(): fix and simplify conflict handling

[git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4c8c8e4..7f2cd55 100644 (file)
--- 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