span># On branch master
# Your branch and &#39;origin/master&#39; have diverged,
# and have 7 and 1 different commit each, respectively.
#
# Unmerged paths:
#   (use &quot;git add/rm &lt;file&gt;...&quot; as appropriate to mark resolution)
#
#   both modified:      blender/landscape_objects/Fallen_tree.blend
#
no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)
</pre></div>
</div>
<p>Список конфликтующих файлов отображен в разделе <