Merge branch 'myBranch1'
Merge branch 'myBranch1'
Forgot git rm --cached
change something
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.txt
yichi's change
new line
Merge branch 'master' of github.com:anbeier/Beispiel
Merge branch 'master' of https://github.com/anbeier/Beispiel

Conflicts:
	test.txt
ganz oben
change 2
Merge branch 'master' of https://github.com/anbeier/Beispiel
ein super commit
Merge pull request #2 from exi/mein_super_brach

Mein super brach