new file:   test.txt
	modified:   test.txt
	modified:   test.txt
	modified:   test.txt
	modified:   test.txt
Merge branch 'master' of j:\GIT\Main

Conflicts:
	test.txt

	modified:   test.txt
	modified:   test.txt
	modified:   test.txt
 Changes to be committed:
	modified:   test.txt
	modified:   test.txt
 Changes to be committed:
	new file:   tester.txt
	modified:   tester.txt
Merge J:\GIT\MAIN