$ git status .
On branch GBA/FR10P03712/adding-group-support
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

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
        modified:   TokenClient.cpp
        new file:   TokenServer.cpp
        modified:   libnxhs.xs

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    TokenServer.cpp