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

Fix cwd problem #49

Merged
merged 8 commits into from
Mar 30, 2014
Merged

Fix cwd problem #49

merged 8 commits into from
Mar 30, 2014

Conversation

asottile
Copy link
Member

@struys If you could double check this before I merge that'd be awesome

@asottile
Copy link
Member Author

Eh I'm going to merge, this blocks other things. We can fixup later if it isn't perfect.

asottile added a commit that referenced this pull request Mar 30, 2014
@asottile asottile merged commit a116a3f into master Mar 30, 2014
@asottile asottile deleted the fix_cwd_problem branch March 30, 2014 20:29
droctothorpe pushed a commit to droctothorpe/pre-commit that referenced this pull request Mar 23, 2022
…flicted_files

Only check merge conflicts on conflict commits
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant