$ git status .
On branch GBA/FR10P03712/adding-group-support
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

        modified:   Makefile.in
        modified:   NX/NXserver.h
        modified:   ServerAnywhere.cpp
        modified:   ServerIo.cpp
        modified:   ServerPhysicalSession.cpp
        modified:   ServerSubsystem.cpp
        modified:   ServerUser.cpp
        deleted:    TokenClient.h
        new file:   TokenServer.cpp
        modified:   libnxhs.xs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

        deleted by them: TokenClient.cpp
        deleted by them: TokenMessage.cpp
        deleted by them: TokenMessage.h