git-merge: document the -S option
[gitweb.git] / t / t9150 /
drwxr-xr-x   parent (dest: t; base: 5f737ac91bd869e65bff401ad1108581ac504e22)
-rw-r--r-- 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump