Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

list index out of range when using vim-fugutive to merge confliction with Gdiff #16

Closed
zhaocai opened this issue Apr 2, 2013 · 2 comments

Comments

@zhaocai
Copy link
Contributor

zhaocai commented Apr 2, 2013

when using vim-fugutive to merge confliction with Gdiff

E684: list index out of range: 1
E116: Invalid arguments for function str2nr(tokens[1]), empty(tokens[2]) ? 1 : str2nr(tokens[2]), str2nr(tokens[3]), empty(tokens[4]) ? 1 : str2nr(tokens[4]) ]
E15: Invalid expression: [ str2nr(tokens[1]), empty(tokens[2]) ? 1 : str2nr(tokens[2]), str2nr(tokens[3]), empty(tokens[4]) ? 1 : str2nr(tokens[4]) ]    
@mhinz
Copy link
Owner

mhinz commented Apr 2, 2013

Thanks for reporting, Zhao!

@mhinz mhinz closed this as completed in f6f6f90 Apr 2, 2013
@zhaocai
Copy link
Contributor Author

zhaocai commented Apr 3, 2013

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants