git fial.

gistfile1.txt

syranez @ marathon :: ~/.vim %% git rebase 376c62b4505258cc5058ce12d64853b46effe102
First, rewinding head to replay your work on top of it...
Applying: VCSCommand eingebunden. Nur für CVS.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): Rename syntax/mkd.vim->syntax/vcscommand/mkd.vim in HEAD and deleted in VCSCommand eingebunden. Nur für CVS.
Failed to merge in the changes.
Patch failed at 0001 VCSCommand eingebunden. Nur für CVS.

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".

syranez @ marathon :: ~/.vim %% git status
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       added by us:        syntax/vcscommand/mkd.vim
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       .netrwhist
no changes added to commit (use "git add" and/or "git commit -a")
syranez @ marathon :: ~/.vim %% git add syntax/vcscommand/mkd.vim 
syranez @ marathon :: ~/.vim %% git rebase --continue
Applying: VCSCommand eingebunden. Nur für CVS.
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

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".

syranez @ marathon :: ~/.vim %%