branched rebase_branch
dfgh
adhgj
4th commit in rebase_branch
Merge branch 'rebase_branch'

Conflicts:
	config.txt