This screenshot demonstrate a sample view of 3-way
folder merge:
You will note that the "mergeable-non-conflicting" file got
the "Auto-merge success" rating. Most of the items got an
automatic resolution. Only those that changed from both sides
relatively to the ancestor get conflicts.
