On at least one repository
You have unmerged paths.
  (fix conflicts using plain git)

Unmerged paths:
        both added:	new1.txt
        both added:	repo/new1.txt
Changes to be committed:

Changes not staged for commit:

Untracked files: