merge: refuse --commit with --squash
[gitweb.git] / t / t7505 /
drwxr-xr-x   parent (dest: t; base: 1d14d0c9949c02260fe4f8b3a54a1b5c605823a2)
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p