alterei o segundo
terceiro alterado
mergo do novoramo

amo'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Update first.txt
first altered from local repository
conflist first resolve
?