ticgit commitgit status
test2 commit
tset3 commit
test4 commit
Merge branch 'new_branch'
test5 commit
ticgit deleted
Merge pull request #1 from truelightn/conflict_branch

Conflict branch