merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t0200 /
drwxr-xr-x   parent (dest: t; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rw-r--r-- 831 test.c
-rw-r--r-- 475 test.perl
-rw-r--r-- 463 test.sh