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

Test for +X11 before using clipboard=unnamedplus #565

Merged
merged 2 commits into from
Feb 20, 2014
Merged

Conversation

johntyree
Copy link
Collaborator

See #564.

@lukedomanski
Copy link
Contributor

Failed, see #564

@lukedomanski
Copy link
Contributor

Fixed.

For anyone trying to pull/fetch+merge in NEW changes/commits from a PR, the instrucitons at https://help.github.com/articles/checking-out-pull-requests-locally neglect to say that you need to make these additional changes to .git\config:

[branch "pr/565"]
    remote = origin
    merge = refs/pull/565/head

johntyree added a commit that referenced this pull request Feb 20, 2014
@johntyree johntyree merged commit 5f6b198 into spf13:3.0 Feb 20, 2014
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

Successfully merging this pull request may close these issues.

None yet

2 participants