line 10
line 1a
Merge remote-tracking branch 'upstream/master' into feature-2
line 11
line L
Merge branch 'feature-2' of github.com:anton-dev-ua-test/test1 into feature-2
lien 12
line M
line 2a
line N
Merge branch 'feature-2' of github.com:anton-dev-ua-test/test1 into feature-2
Merge remote-tracking branch 'upstream/master' into feature-2
line 3a
line 120
merge and resolve
Merge pull request #8 from anton-dev-ua-test/feature-2

Feature 2
-------- excersise 2 --------
line 6
line 1a
line 3a