KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
Git merge conflicts are shown like this usually: <<<<<<< HEAD:file.txt Code changed by A ======= Code changed by B >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt However, I know it is possible (with some git config option) to also show the original code and not only the changes. Something like: <<<<<<< HEAD:file.txt Code changed by A ======= Original code ======= Code changed by B >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt However, I can't find the option anymore. Can anyone help me out?
Tags (comma-separated)
Save Edits
Cancel