unpack-trees: do not fail reset because of unmerged skipped entry
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: b33fdfc34cda95f92cc7a50e5c81b87f8ee65eef)
-rwxr-xr-x 5944 test.pl