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.

Sign up for GitHub

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

Jump to bottom

Cannot apply patch because my file delimiter is "/r/n" instead of "/n" #141

Closed
soulbeing opened this issue Oct 12, 2016 · 3 comments
Closed

Cannot apply patch because my file delimiter is "/r/n" instead of "/n" #141

soulbeing opened this issue Oct 12, 2016 · 3 comments

Comments

@soulbeing
Copy link
Contributor

My target file(the one going to apply the patch) has "/r/n" as line delimiter, so because in the apply.js at line 32 you hard coded to separate the file with "/n", and this will result in "false" returned from compareLine method, and the patch generated from "git diff" command cannot be applied to my file. Any action will take on this?
@soulbeing
Copy link
Contributor Author

it's on Window btw,

@soulbeing
Copy link
Contributor Author

fixed in my pull request

@alexdrans
Copy link

Hey @soulbeing, did this ever make it in? diffLines also doesn't work for Windows line endings (on OS X). Going to investigate now.

@ExplodingCabbage ExplodingCabbage mentioned this issue Dec 20, 2023
Closed
@ExplodingCabbage ExplodingCabbage mentioned this issue May 31, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@alexdrans @soulbeing