editor to find git conflicts code example

Example 1: git find merge conflicts

git diff --name-only --diff-filter=U

Example 2: how to show code conflicts in git

$ git statusOn branch masterYou have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Unmerged paths:(use "git add <file>..." to mark resolution)both modified:   merge.txt