local change is merged with remote change
local and remote are merged
Merge branch 'master' of git://github.com/rajeshbgit/repo3.git

Conflicts:
	file2