Use git-merge instead of git-resolve in git-pull.
[git/gitweb.git] / compat / 
tree8e1743b860a32604a0bd60d1f725096956182c52
drwxr-xr-x   ..
-rw-r--r-- 438 strcasestr.c
-rw-r--r-- 40883 subprocess.py