name
my file

new line to cherry-pick from branch2.

new line at top - hotfix

this is a test repo. number 2.

add line with sublime text

brand new unconflicted line.

line added in gifdev./added at end of line.

xxx-master

new line added in master.