1.txt
:change
change
Merge branch 'master' of ../jquery2

Conflicts:
	1.txt