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