Git stuffz

Macintosh:Wesnoth cd$ git checkout vultraz-editor-tod
Checking out files: 100% (946/946), done.
Switched to branch 'vultraz-editor-tod'
Macintosh:Wesnoth cd$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Reporposed Editor Settings dialog as a Custom ToD dialog
Using index info to reconstruct a base tree...
<stdin>:423: trailing whitespace.

<stdin>:483: trailing whitespace.

warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	src/editor/editor_controller.hpp
	src/hotkeys.hpp
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Reporposed Editor Settings dialog as a Custom ToD dialog

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

Macintosh:Wesnoth cd$ git diff
Macintosh:Wesnoth cd$ git status
# Not currently on any branch.
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	info/
#	projectfiles/Xcode/Wesnoth.xcodeproj/project.xcworkspace/
#	projectfiles/Xcode/Wesnoth.xcodeproj/xcuserdata/
nothing added to commit but untracked files present (use "git add" to track)
Macintosh:Wesnoth cd$