restore: replace --force with --ignore-unmerged
[gitweb.git] / t / t4034 / php /
drwxr-xr-x   parent (dest: t/t4034; base: a5e5f399ca89cea574d11704d625a7b28b53de76)
-rw-r--r-- 2022 expect
-rw-r--r-- 241 post
-rw-r--r-- 234 pre