v.next change
Merge remote-tracking branch 'origin/v1'

Conflicts:
	dir1.txt
changed everything
Update file2.txt
Merge branch 'master' of https://github.com/acastruc/test
Merge branch 'refs/heads/v1'

Conflicts:
	dir1.txt
master update
Merge branch 'refs/heads/v1'

Conflicts:
	dir1.txt
Merge branch 'refs/heads/v1-tracked'

Conflicts:
	file2.txt
Update file2.txt
Merge branch 'refs/heads/v1-tracked'

Conflicts:
	file2.txt
Update dir1.txt
Update file2.txt
Update file.txt
Create mynewfeature.txt
Merge remote-tracking branch 'origin/master' into v1-my-feature

Conflicts:
	dir1.txt