committing on branchx for file2
commit for file3 on branchy
commit made by master for file1
Merging branchx with master.
Merging 'branchy' with master
asdf