merge script: handle --no-ff --no-commit correctly
[gitweb.git] / t / t9121 /
drwxr-xr-x   parent (dest: t; base: 2a70fa4f1e377bc68bcabdc1a550e9970acccda7)
-rw-r--r-- 1046 renamed-dir.dump