merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / t / t9601 /
drwxr-xr-x   parent (dest: t; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
drwxr-xr-x - cvsroot