merge: refuse --commit with --squash
[gitweb.git] / t / t4034 / bibtex /
drwxr-xr-x   parent (dest: t/t4034; base: 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2)
-rw-r--r-- 806 expect
-rw-r--r-- 460 post
-rw-r--r-- 320 pre