git - rerere：如何在“自动解决”后查看原始冲突？

Question

合并后我得到下一个日志：

git merge --no-ff feature/seamless_registration 
Auto-merging cpanfile
CONFLICT (content): Merge conflict in cpanfile
Auto-merging bin/myapp
CONFLICT (content): Merge conflict in bin/myapp
Resolved 'bin/myapp' using previous resolution.
Resolved 'cpanfile' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.

在此之后，我可以查看如何解决此合并冲突：

$git diff cpanfile
...

但是如何查看原始合并冲突？

man git rerere似乎没有这样的命令

Answer 1

git checkout -m cpanfile应该将文件返回到冲突前解决状态