rerere: mention caveat about unmatched conflict markers
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: bc4caecf9557c765951897d8483b1514ebae74bf)
-rw-r--r-- 116 diff.NUL