On So, 2016-10-23 at 21:54 +0200, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Hmm, this one throws strange errors at me:
kraxel@nilsson ~/projects/qemu (queue/ui)# git am -3
~/Downloads/patches/input/\[PATCH_1_3
\]_Add_dots_keypresses_support_to_the_baum_braille_device.mbox
Applying: Add dots keypresses support to the baum braille device
Using index info to reconstruct a base tree...
M backends/baum.c
error: patch failed: backends/baum.c:1
error: backends/baum.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Hmm? How can that happen?
/me looks puzzled.
Cannot fall back to three-way merge.
Patch failed at 0001 Add dots keypresses support to the baum braille
device
cheers,
Gerd
