merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / contrib / convert-objects /
drwxr-xr-x   parent (dest: contrib; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 7436 convert-objects.c
-rw-r--r-- 464 git-convert-objects.txt