git:如何为合并冲突获得“资源、资源、原始”?
原文：git: How to get "ours, theirs, original" for merge conflicts?

Git merge conflicts are shown like this usually: <<<<<<< HEAD:file.txt Code changed by A ======= Code changed by B >>>>>>> ...