edit file wedus.txt
Merge branch 'master' into cabang4
Merge commit '3a75e08e4ef0217c5aeea3857df04a3d5bd34178' into cabang4
edit file wedus tambah 3baris
edit file wedus tambah 1baris
edit file wedus hapus 2baris
Merge branch 'cabang4'

Conflicts:
	wedus.txt