gittest
gittest1
merger conflict
gittest
commit
111111
1
----
-----2
XX
line 2
last
merge
test