nb
nb2
master goes its own way
Merge branch 'nb' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
Merge branch 'master' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
(retry after rollback) Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
(second commit after pull-after retry)Merge branch 'master' of https://github.com/EBAdmin/TestRepo
nb3
Merge branch 'nb' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
(REDO)Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
(REDO2)Merge branch 'master' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
nb
master
Merge branch 'nb' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
Merge branch 'tst-2' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt
This reverts commit 9b58838a60c6e6a9e7f362e6a3ce5420aa39b52c, reversing
changes made to 7bd61c63324fc14209ad9ae6198c0dbf2efe5b06.

revert of merge of tst2 into master

Revert "Merge branch 'nb' of https://github.com/EBAdmin/TestRepo"

This reverts commit 7bd61c63324fc14209ad9ae6198c0dbf2efe5b06, reversing
changes made to d1f3a3dcdd81aa94012657eb936539f6936a468b.

revert of merge of nb into master