合并后我得到下一个日志：
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似乎没有这样的命令
答案 0 :(得分：0)
def plot_probability_per_class(probabilities, classes, image):
figure = plt.figure()
figure.subplots_adjust(right=1.5, hspace=0.5)
subplot = figure.add_subplot(1,2,1)
subplot.set_title('Probability per class')
plt.plot(classes, probabilities, 'ro')
plt.ylabel('Probability')
plt.xlabel('Class ID')
subplot = figure.add_subplot(1,2,2)
subplot.set_title('Image')
plt.imshow(image)
plt.show()
应该将文件返回到冲突前解决状态