Permalink
Browse files

Merge commit 'amjith/master'

Conflicts:
	plugin/git.vim
  • Loading branch information...
2 parents 022fb41 + 4421506 commit cb110a2a9c1532b8737ed37953aeaaa48436351c @motemen committed Sep 8, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 plugin/git.vim
View
4 plugin/git.vim
@@ -49,8 +49,8 @@ endfunction
function! GitBranch()
let git_dir = <SID>GetGitDir()
- if strlen(git_dir) && filereadable(git_dir . 'HEAD')
- let lines = readfile(git_dir . 'HEAD')
+ if strlen(git_dir) && filereadable(git_dir . '/HEAD')
+ let lines = readfile(git_dir . '/HEAD')
if !len(lines)
return ''
else

0 comments on commit cb110a2

Please sign in to comment.