shadowm@nanacore:~/src/wesnoth$ git status
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   data/gui/default/window/editor_settings.cfg
#       modified:   src/editor/editor_controller.cpp
#       modified:   src/editor/editor_controller.hpp
#       modified:   src/gui/dialogs/editor_settings.hpp
#       modified:   src/hotkeys.cpp
#       modified:   src/hotkeys.hpp
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      data/themes/editor.cfg
#       both modified:      src/gui/dialogs/editor_settings.cpp
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       conflict-1
#       foo/
#       gui1_bugfix20381.patch
#       gui1_bugfix20381_2.patch
#       vultraz-patches/