modified one.txt
modified by develop
modified by develop
Merge branch 'develop'
modified by myfeature
Merge branch 'myfeature'
Merge branch 'myfeature' into develop
modified by myfeatu
Merge branch 'develop' into myfeature
Merge branch 'develop'
Merge branch 'myfeature'