commit 4.txt on branch test2
commit zp03 on branch test1
on test1
Merge branch 'test1', remote-tracking branch 'origin/test1' into test1
Merge branch 'test1'