merge overwrites unstaged changes in renamed file
[gitweb.git] / t / t9601 / cvsroot / CVSROOT /
drwxr-xr-x   parent (dest: t/t9601/cvsroot; base: 30fd3a5425)