Konkurrierende test.txt angelegt
merget test.txt
merged 2
Merge branch 'tomerge'