master commit
master commit
rebase commit
изменения в rebase
изменения в test
commit
изменения в rebase
rebase commit
ignore file added
add new file
Merge remote-tracking branch 'origin/test' into test
Merge remote-tracking branch 'origin/rebase' into test

Conflicts:
	file.txt
Merge branch 'master' into test
Merge branch 'rebase' into test

Conflicts:
	file.txt