Git 回复：如何在“自动解决”后查看原始冲突？

合并后，我将获得下一个日志：

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 rere

似乎没有这样的命令

git checkout-m cpanfile

应该将文件返回到冲突前解决状态

git checkout-m cpanfile

应该将文件返回到冲突前解决状态

可能有帮助：可能有帮助：我不想查看原始文件。我想在自动解决之前查看合并冲突。我不想查看原始文件。我想在自动解决之前查看合并冲突。