merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / t / t9604 / cvsroot / module /
drwxr-xr-x   parent (dest: t/t9604/cvsroot; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rw-r--r-- 2002 a,v