Git compare "base" version with "theirs" version of a conflicted file?
Simply type git diff
and it will show only the conflicts.
Further reading: Advanced Merging
Notice the --base
and --theirs
arguments for diff
git diff :1:foo.txt :3:foo.txt
More info at man gitrevisions; look for :[<n>:]<path>
.