git extension select 2 when resolving merge conflicts code example Example: git find merge conflicts git diff --name-only --diff-filter=U