Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / compat /
drwxr-xr-x   parent (dest: ; base: f887564ab72e107bcdee3ba83c91e2bb4ae13ca7)
-rw-r--r-- 438 strcasestr.c
-rw-r--r-- 40883 subprocess.py