master(*) 11.txt
f (+) 12.txt
f (+) 11.txt 12.txt
Merge branch 'f'