merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / Documentation / pt_BR /
drwxr-xr-x   parent (dest: Documentation; base: 3c217c077a86)
-rw-r--r-- 24126 gittutorial.txt