merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / t / t5000 /
drwxr-xr-x   parent (dest: t; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 2048 19f9c8273ec45a8938e6999cb59b3ff66739902a
-rw-r--r-- 2048 huge-and-future.tar
-rw-r--r-- 10240 pax.tar