vanessa@rainbird:~/Minetest-related/minetest_core$ git am ~/2ce5ffeb92c4d76bc8fc9c01fc01a76fe2a6b546.patch
Applying: Improve displacement mapping
/home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:113: trailing whitespace.
	vec3 eyeRay = normalize(tsEyeVec);
/home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:185: trailing whitespace.
		float specular = pow(clamp(dot(reflect(L, bump.xyz), -E), 0.0, 1.0), 1.0);
/home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:237: trailing whitespace.
#else
/home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:240: trailing whitespace.

/home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch:531: trailing whitespace.

error: patch failed: client/shaders/nodes_shader/opengl_vertex.glsl:14
error: client/shaders/nodes_shader/opengl_vertex.glsl: patch does not apply
Patch failed at 0001 Improve displacement mapping
The copy of the patch that failed is found in:
   /home/vanessa/Minetest-related/minetest_core/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
vanessa@rainbird:~/Minetest-related/minetest_core$