Revert "Use git-merge instead of git-resolve in git-pull."
[git.git] / compat / strcasestr.c
2005-09-19 Linus Torvalds[PATCH] strcasestr compatibility replacement