rerere: how to view original conflict after `autoresolution`?

Question

After merging I get next log:

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.

After this I can view how this merge conflicts are resolved:

$git diff cpanfile
...

But how can I view original merge conflict?

man git rerere seems has no such command

Might be of help: http://stackoverflow.com/a/21635422/116923 — adrianbanks, Dec 07 '16 at 18:07

score 0 · Answer 1 · answered Dec 07 '16 at 20:28

0

git checkout -m cpanfile should return the file to pre-conflict-resolution state

answered Dec 07 '16 at 20:28

IrLED

438
2
5

I do not want to view original file. I want to view merge conflict before auto resolution. – Eugen Konkov Dec 08 '16 at 09:05

rerere: how to view original conflict after `autoresolution`?

1 Answers1