git-rerere: detect unparsable conflicts
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: a1b32fdc3d1d05395f186bfa06e92174519dab8d)
-rw-r--r-- 116 diff.NUL